From 4b57f2bdbba74093daf79dbf54b397baafba4512 Mon Sep 17 00:00:00 2001 From: JPVenson Date: Sun, 2 Feb 2025 02:10:14 +0000 Subject: [PATCH] Fixed whitespace formatting --- .devcontainer/devcontainer.json | 2 +- .devcontainer/pgsql/devcontainer.json | 28 +++++++++++++------------ .devcontainer/pgsql/docker-compose.yaml | 2 -- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index bcdd82cb9a..c2127ba5c3 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -2,7 +2,7 @@ "name": "Development Jellyfin Server", "image": "mcr.microsoft.com/devcontainers/dotnet:9.0-bookworm", "service": "app", - "workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}", + "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/devcontainer.json b/.devcontainer/pgsql/devcontainer.json index 7fb09fdc9c..3dd91d9755 100644 --- a/.devcontainer/pgsql/devcontainer.json +++ b/.devcontainer/pgsql/devcontainer.json @@ -2,24 +2,26 @@ "name": "Development Jellyfin Server", "dockerComposeFile": "docker-compose.yaml", "service": "app", - "workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}", + "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 "postAttachCommand": "cat .vscode/extensions.json | jq -r .recommendations[] | xargs -n 1 code --install-extension", - "forwardPorts": ["pgadmin:8081"], - "portsAttributes": { - "8081": { - "label": "pgAdmin", - "onAutoForward": "notify", - "requireLocalPort": true - }, + "forwardPorts": [ + "pgadmin:8081" + ], + "portsAttributes": { + "8081": { + "label": "pgAdmin", + "onAutoForward": "notify", + "requireLocalPort": true + }, "8096": { - "label": "jellyfinapi", - "onAutoForward": "notify", - "requireLocalPort": true - } - }, + "label": "jellyfinapi", + "onAutoForward": "notify", + "requireLocalPort": true + } + }, "features": { "ghcr.io/devcontainers/features/dotnet:2": { "version": "none", diff --git a/.devcontainer/pgsql/docker-compose.yaml b/.devcontainer/pgsql/docker-compose.yaml index dda6deda69..45af0b33e1 100644 --- a/.devcontainer/pgsql/docker-compose.yaml +++ b/.devcontainer/pgsql/docker-compose.yaml @@ -14,7 +14,6 @@ services: # Runs app on the same network as the database container, allows "forwardPorts" in devcontainer.json function. network_mode: service:pgadmin - # Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root. # user: root @@ -42,7 +41,6 @@ services: - PGADMIN_LISTEN_PORT=8081 - PGADMIN_SERVER_JSON_FILE=/pgadmin/servers.json - PGADMIN_CONFIG_SERVER_MODE=False - # Add "forwardPorts": ["5432"] to **devcontainer.json** to forward PostgreSQL locally. # (Adding the "ports" property to this file will not forward from a Codespace.)