diff options
| author | JPVenson <JPVenson@users.noreply.github.com> | 2024-01-18 23:11:22 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-18 23:11:22 +0000 |
| commit | 21ae7a1317255acd0a031e74575f6c08967ce5f3 (patch) | |
| tree | 7d9295e1c7216232242c5859c4bed7ba5f6544a8 | |
| parent | a884b1f7869436fb373d71106330ab1db79cee11 (diff) | |
Added ffmpeg version to build
| -rw-r--r-- | .devcontainer/Dev - Server Default/devcontainer.json (renamed from .devcontainer/devcontainer.json) | 0 | ||||
| -rw-r--r-- | .devcontainer/Dev - Server Ffmpeg/devcontainer.json | 28 | ||||
| -rw-r--r-- | .devcontainer/Dev - Server Ffmpeg/install-ffmpeg.sh | 5 | ||||
| -rw-r--r-- | .vscode/extensions.json | 2 |
4 files changed, 34 insertions, 1 deletions
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/Dev - Server Default/devcontainer.json index 063901c80..063901c80 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/Dev - Server Default/devcontainer.json diff --git a/.devcontainer/Dev - Server Ffmpeg/devcontainer.json b/.devcontainer/Dev - Server Ffmpeg/devcontainer.json new file mode 100644 index 000000000..8d1413d09 --- /dev/null +++ b/.devcontainer/Dev - Server Ffmpeg/devcontainer.json @@ -0,0 +1,28 @@ +{ + "name": "Development Jellyfin Server - FFmpeg", + "image":"mcr.microsoft.com/devcontainers/dotnet:8.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; bash ./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": "8.0", + "aspNetCoreRuntimeVersions": "8.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 new file mode 100644 index 000000000..d2a54b98f --- /dev/null +++ b/.devcontainer/Dev - Server Ffmpeg/install-ffmpeg.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +sudo wget https://repo.jellyfin.org/releases/server/ubuntu/versions/jellyfin-ffmpeg/6.0-8/jellyfin-ffmpeg6_6.0-8-focal_amd64.deb -O ffmpeg.deb +sudo apt install -f ./ffmpeg.deb -y +rm ffmpeg.deb
\ No newline at end of file diff --git a/.vscode/extensions.json b/.vscode/extensions.json index d738e9fba..3be946e44 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -2,7 +2,7 @@ "recommendations": [ "ms-dotnettools.csharp", "editorconfig.editorconfig", - "GitHub.vscode-github-actions", + "github.vscode-github-actions", "ms-dotnettools.vscode-dotnet-runtime", "ms-dotnettools.csdevkit" ], |