diff --git a/Dockerfile b/Dockerfile index 4d4852b..7a10a35 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine:3.17 as buildstage +FROM ghcr.io/linuxserver/baseimage-alpine:3.18 as buildstage ARG MOD_VERSION @@ -18,14 +18,10 @@ RUN \ DOTNET_RELEASE_URL=$(echo "${DOTNET_JSON}" | jq -r ".\"releases-index\"[] | select(.\"latest-sdk\"==\"${i}\") | .\"releases.json\"") && \ DOTNET_RELEASE_JSON=$(curl -fSsLX GET "${DOTNET_RELEASE_URL}") && \ AMD64_URL=$(echo "${DOTNET_RELEASE_JSON}" | jq -r ".releases[] | select(.sdk.version==\"${i}\") | .sdk.files[] | select(.name | contains(\"linux-x64.tar.gz\")) | .url") && \ - ARM32_URL=$(echo "${DOTNET_RELEASE_JSON}" | jq -r ".releases[] | select(.sdk.version==\"${i}\") | .sdk.files[] | select(.name | contains(\"linux-arm.tar.gz\")) | .url") && \ ARM64_URL=$(echo "${DOTNET_RELEASE_JSON}" | jq -r ".releases[] | select(.sdk.version==\"${i}\") | .sdk.files[] | select(.name | contains(\"linux-arm64.tar.gz\")) | .url") && \ curl -fSL --retry 3 --retry-connrefused -o \ /root-layer/dotnet/dotnetsdk_"${i}"_x86_64.tar.gz -L \ "${AMD64_URL}" && \ - curl -fSL --retry 3 --retry-connrefused -o \ - /root-layer/dotnet/dotnetsdk_"${i}"_armv7l.tar.gz -L \ - "${ARM32_URL}" && \ curl -fSL --retry 3 --retry-connrefused -o \ /root-layer/dotnet/dotnetsdk_"${i}"_aarch64.tar.gz -L \ "${ARM64_URL}" || exit 1; \ diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-dotnet-add-package/run b/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-dotnet-add-package/run index 1e093e7..9738f7b 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-dotnet-add-package/run +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-dotnet-add-package/run @@ -2,6 +2,11 @@ # Determine if setup is needed if [ -d /dotnet ]; then + ARCH=$(uname -m) + if [[ "${ARCH}" = "armv7l" ]]; then + echo "**** The dotnet mod no longer supports arm32v7/armhf images, exiting ****" + exit 0 + fi # install deps echo "**** Adding dotnet dependencies to package install list ****" source /etc/lsb-release @@ -16,7 +21,6 @@ if [ -d /dotnet ]; then rm -rf /dotnet_* fi DOTNET_VERSIONS=$(cat /dotnet/versions.txt) - ARCH=$(uname -m) for i in $DOTNET_VERSIONS; do mkdir -p "/dotnet_${i}" tar xzf "/dotnet/dotnetsdk_${i}_${ARCH}.tar.gz" -C "/dotnet_${i}"