From ceb850c77052c465af8422dcf152f1d1d1530457 Mon Sep 17 00:00:00 2001 From: Bond-009 Date: Sat, 16 Nov 2024 18:11:01 +0100 Subject: Update projects to .NET 9 (#13023) --- .devcontainer/devcontainer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to '.devcontainer/devcontainer.json') diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 063901c80..0cf768f1f 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "Development Jellyfin Server", - "image":"mcr.microsoft.com/devcontainers/dotnet:8.0-jammy", + "image":"mcr.microsoft.com/devcontainers/dotnet:9.0-jammy", // restores nuget packages, installs the dotnet workloads and installs the dev https certificate "postStartCommand": "dotnet restore; dotnet workload update; dotnet dev-certs https --trust", // reads the extensions list and installs them @@ -8,8 +8,8 @@ "features": { "ghcr.io/devcontainers/features/dotnet:2": { "version": "none", - "dotnetRuntimeVersions": "8.0", - "aspNetCoreRuntimeVersions": "8.0" + "dotnetRuntimeVersions": "9.0", + "aspNetCoreRuntimeVersions": "9.0" }, "ghcr.io/devcontainers-contrib/features/apt-packages:1": { "preserve_apt_list": false, -- cgit v1.2.3 From 556f4c4bfbf915eec3b1b9983f1c132916281b67 Mon Sep 17 00:00:00 2001 From: JPVenson Date: Sat, 30 Nov 2024 12:07:48 +0100 Subject: Updated DevContainer to Bookworm Debian (#13037) * Updated DevContainer to Bookworm Debian Removed dual container and made FFmpeg install default * Update .devcontainer/devcontainer.json Co-authored-by: Bond-009 * Fixed Tabs --------- Co-authored-by: Bond-009 --- .../Dev - Server Ffmpeg/devcontainer.json | 28 ------------------- .../Dev - Server Ffmpeg/install-ffmpeg.sh | 32 ---------------------- .devcontainer/devcontainer.json | 4 +-- .devcontainer/install-ffmpeg.sh | 32 ++++++++++++++++++++++ .vscode/extensions.json | 11 ++++---- 5 files changed, 40 insertions(+), 67 deletions(-) delete mode 100644 .devcontainer/Dev - Server Ffmpeg/devcontainer.json delete mode 100644 .devcontainer/Dev - Server Ffmpeg/install-ffmpeg.sh create mode 100644 .devcontainer/install-ffmpeg.sh (limited to '.devcontainer/devcontainer.json') diff --git a/.devcontainer/Dev - Server Ffmpeg/devcontainer.json b/.devcontainer/Dev - Server Ffmpeg/devcontainer.json deleted file mode 100644 index a934512f4..000000000 --- a/.devcontainer/Dev - Server Ffmpeg/devcontainer.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "name": "Development Jellyfin Server - FFmpeg", - "image":"mcr.microsoft.com/devcontainers/dotnet:9.0-jammy", - // restores nuget packages, installs the dotnet workloads and installs the dev https certificate - "postStartCommand": "dotnet restore; dotnet workload update; dotnet dev-certs https --trust; sudo bash \"./.devcontainer/Dev - Server Ffmpeg/install-ffmpeg.sh\"", - // reads the extensions list and installs them - "postAttachCommand": "cat .vscode/extensions.json | jq -r .recommendations[] | xargs -n 1 code --install-extension", - "features": { - "ghcr.io/devcontainers/features/dotnet:2": { - "version": "none", - "dotnetRuntimeVersions": "9.0", - "aspNetCoreRuntimeVersions": "9.0" - }, - "ghcr.io/devcontainers-contrib/features/apt-packages:1": { - "preserve_apt_list": false, - "packages": ["libfontconfig1"] - }, - "ghcr.io/devcontainers/features/docker-in-docker:2": { - "dockerDashComposeVersion": "v2" - }, - "ghcr.io/devcontainers/features/github-cli:1": {}, - "ghcr.io/eitsupi/devcontainer-features/jq-likes:2": {} - }, - "hostRequirements": { - "memory": "8gb", - "cpus": 4 - } -} diff --git a/.devcontainer/Dev - Server Ffmpeg/install-ffmpeg.sh b/.devcontainer/Dev - Server Ffmpeg/install-ffmpeg.sh deleted file mode 100644 index c867ef538..000000000 --- a/.devcontainer/Dev - Server Ffmpeg/install-ffmpeg.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash - -## configure the following for a manuall install of a specific version from the repo - -# wget https://repo.jellyfin.org/releases/server/ubuntu/versions/jellyfin-ffmpeg/6.0.1-1/jellyfin-ffmpeg6_6.0.1-1-jammy_amd64.deb -O ffmpeg.deb - -# sudo apt update -# sudo apt install -f ./ffmpeg.deb -y -# rm ffmpeg.deb - - -## Add the jellyfin repo -sudo apt install curl gnupg -y -sudo apt-get install software-properties-common -y -sudo add-apt-repository universe -y - -sudo mkdir -p /etc/apt/keyrings -curl -fsSL https://repo.jellyfin.org/jellyfin_team.gpg.key | sudo gpg --dearmor -o /etc/apt/keyrings/jellyfin.gpg -export VERSION_OS="$( awk -F'=' '/^ID=/{ print $NF }' /etc/os-release )" -export VERSION_CODENAME="$( awk -F'=' '/^VERSION_CODENAME=/{ print $NF }' /etc/os-release )" -export DPKG_ARCHITECTURE="$( dpkg --print-architecture )" -cat <