Trez/docker-mods-uptime-kuma-timeout-fix
4
0
Fork 0
mirror of https://github.com/TrezOne/docker-mods-uptime-kuma-timeout-fix.git synced 2026-07-20 10:21:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #786 from linuxserver/code-server-dotnet-armhf

Browse Source 
code-server-dotnet: deprecate arm32
This commit is contained in:
aptalca
2023-11-14 11:32:38 -05:00
committed by GitHub
parent 94357a8774 5cfe5a0194
commit 17f7b26bbd
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Dockerfile
+1 -5
View File
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1 # 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 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_URL=$(echo "${DOTNET_JSON}" | jq -r ".\"releases-index\"[] | select(.\"latest-sdk\"==\"${i}\") | .\"releases.json\"") && \
DOTNET_RELEASE_JSON=$(curl -fSsLX GET "${DOTNET_RELEASE_URL}") && \ 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") && \ 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") && \ 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 \ curl -fSL --retry 3 --retry-connrefused -o \
/root-layer/dotnet/dotnetsdk_"${i}"_x86_64.tar.gz -L \ /root-layer/dotnet/dotnetsdk_"${i}"_x86_64.tar.gz -L \
"${AMD64_URL}" && \ "${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 \ curl -fSL --retry 3 --retry-connrefused -o \
/root-layer/dotnet/dotnetsdk_"${i}"_aarch64.tar.gz -L \ /root-layer/dotnet/dotnetsdk_"${i}"_aarch64.tar.gz -L \
"${ARM64_URL}" || exit 1; \ "${ARM64_URL}" || exit 1; \
root/etc/s6-overlay/s6-rc.d/init-mod-code-server-dotnet-add-package/run
+5 -1
View File
@@ -2,6 +2,11 @@
# Determine if setup is needed # Determine if setup is needed
if [ -d /dotnet ]; then 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 # install deps
echo "**** Adding dotnet dependencies to package install list ****" echo "**** Adding dotnet dependencies to package install list ****"
source /etc/lsb-release source /etc/lsb-release
@@ -16,7 +21,6 @@ if [ -d /dotnet ]; then
rm -rf /dotnet_* rm -rf /dotnet_*
fi fi
DOTNET_VERSIONS=$(cat /dotnet/versions.txt) DOTNET_VERSIONS=$(cat /dotnet/versions.txt)
ARCH=$(uname -m)
for i in $DOTNET_VERSIONS; do for i in $DOTNET_VERSIONS; do
mkdir -p "/dotnet_${i}" mkdir -p "/dotnet_${i}"
tar xzf "/dotnet/dotnetsdk_${i}_${ARCH}.tar.gz" -C "/dotnet_${i}" tar xzf "/dotnet/dotnetsdk_${i}_${ARCH}.tar.gz" -C "/dotnet_${i}"