From 1c2f808646a917799d132778a4b228bcac63b4f7 Mon Sep 17 00:00:00 2001 From: aptalca Date: Sun, 13 Dec 2020 13:58:47 -0500 Subject: [PATCH] Include current dotnet release --- .github/workflows/BuildImage.yml | 2 +- Dockerfile | 2 +- README.md | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/BuildImage.yml b/.github/workflows/BuildImage.yml index 6f1d6aa..7f578dc 100644 --- a/.github/workflows/BuildImage.yml +++ b/.github/workflows/BuildImage.yml @@ -17,7 +17,7 @@ jobs: run: | # Set version DOTNET_JSON="$(curl --retry 5 -sX GET https://raw.githubusercontent.com/dotnet/core/master/release-notes/releases-index.json)" - DOTNET_VERSIONS="$(echo $DOTNET_JSON | jq -r '."releases-index"[] | select(."support-phase"=="lts") | ."latest-sdk"' | tr '\n' ' ' | head -c -1)" + DOTNET_VERSIONS="$(echo $DOTNET_JSON | jq -r '."releases-index"[] | select(."support-phase"=="lts" or ."support-phase"=="current") | ."latest-sdk"' | tr '\n' ' ' | head -c -1)" DOTNET_TAG="$(echo $DOTNET_VERSIONS | tr ' ' '_')" echo "DOTNET_TAG=${DOTNET_TAG}" >> $GITHUB_ENV # Build image diff --git a/Dockerfile b/Dockerfile index 496a000..d8a867f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ RUN \ jq && \ DOTNET_JSON=$(curl -sX GET "https://raw.githubusercontent.com/dotnet/core/master/release-notes/releases-index.json") && \ if [ -z ${DOTNET_VERSIONS+x} ]; then \ - DOTNET_VERSIONS=$(echo "$DOTNET_JSON" | jq -r '."releases-index"[] | select(."support-phase"=="lts") | ."latest-sdk"' | tr '\n' ' ' | head -c -1); \ + DOTNET_VERSIONS=$(echo "$DOTNET_JSON" | jq -r '."releases-index"[] | select(."support-phase"=="lts" or ."support-phase"=="current") | ."latest-sdk"' | tr '\n' ' ' | head -c -1); \ fi && \ mkdir -p /root-layer/dotnet && \ echo "$DOTNET_VERSIONS" > /root-layer/dotnet/versions.txt && \ diff --git a/README.md b/README.md index 8e1d5fe..6453b27 100644 --- a/README.md +++ b/README.md @@ -6,8 +6,8 @@ In code server docker arguments, set an environment variable `DOCKER_MODS=linuxs If adding multiple mods, enter them in an array separated by `|`, such as `DOCKER_MODS=linuxserver/mods:code-server-dotnet|linuxserver/mods:code-server-mod2` -All current [lts releases](https://dotnet.microsoft.com/download/dotnet-core) will be made available inside the container (3.1.403 and 2.1.811 as of 2020/10/14). +The [current release and all current lts releases](https://dotnet.microsoft.com/download/dotnet-core) will be made available inside the container (5.0.101, 3.1.404 and 2.1.811 as of 2020/12/13). The binaries are accessible at `/dotnet_/dotnet` for each respective version. -The latest version binary is symlinked from `/usr/local/bin/dotnet` so it can be called via `dotnet` from anywhere. +The current version binary is symlinked from `/usr/local/bin/dotnet` so it can be called via `dotnet` from anywhere.