diff options
| -rw-r--r-- | .devcontainer/devcontainer.json | 2 | ||||
| -rw-r--r-- | .devcontainer/pgsql/Dockerfile | 2 | ||||
| -rw-r--r-- | .devcontainer/pgsql/devcontainer.json | 5 | ||||
| -rw-r--r-- | .devcontainer/pgsql/docker-compose.yaml | 2 |
4 files changed, 7 insertions, 4 deletions
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 84c1dda97..bcdd82cb9 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,6 +1,8 @@ { "name": "Development Jellyfin Server", "image": "mcr.microsoft.com/devcontainers/dotnet:9.0-bookworm", + "service": "app", + "workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}", // restores nuget packages, installs the dotnet workloads and installs the dev https certificate "postStartCommand": "sudo dotnet restore; sudo dotnet workload update; sudo dotnet dev-certs https --trust; sudo bash \"./.devcontainer/install-ffmpeg.sh\"", // reads the extensions list and installs them diff --git a/.devcontainer/pgsql/Dockerfile b/.devcontainer/pgsql/Dockerfile index 800bec76f..ff7f3bcd7 100644 --- a/.devcontainer/pgsql/Dockerfile +++ b/.devcontainer/pgsql/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/devcontainers/dotnet:1-8.0-bookworm +FROM mcr.microsoft.com/devcontainers/dotnet:9.0-bookworm # [Optional] Uncomment this section to install additional OS packages. # RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ diff --git a/.devcontainer/pgsql/devcontainer.json b/.devcontainer/pgsql/devcontainer.json index db7f84c89..7fb09fdc9 100644 --- a/.devcontainer/pgsql/devcontainer.json +++ b/.devcontainer/pgsql/devcontainer.json @@ -1,7 +1,8 @@ { "name": "Development Jellyfin Server", - "image": "mcr.microsoft.com/devcontainers/dotnet:9.0-bookworm", - "dockerComposeFile": "docker-compose.yml", + "dockerComposeFile": "docker-compose.yaml", + "service": "app", + "workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}", // restores nuget packages, installs the dotnet workloads and installs the dev https certificate "postStartCommand": "sudo dotnet restore; sudo dotnet workload update; sudo dotnet dev-certs https --trust; sudo bash \"./.devcontainer/install-ffmpeg.sh\"", // reads the extensions list and installs them diff --git a/.devcontainer/pgsql/docker-compose.yaml b/.devcontainer/pgsql/docker-compose.yaml index 88954d564..891a03673 100644 --- a/.devcontainer/pgsql/docker-compose.yaml +++ b/.devcontainer/pgsql/docker-compose.yaml @@ -7,7 +7,7 @@ services: dockerfile: Dockerfile volumes: - - ../..:/workspaces:cached + - ../../..:/workspaces:cached # Overrides default command so things don't shut down after the process ends. command: sleep infinity |