Skip to content

Commit 57c4943

Browse files
committed
add libicu dep, fix curl issue
1 parent 7dc404e commit 57c4943

File tree

4 files changed

+15
-10
lines changed

4 files changed

+15
-10
lines changed

Dockerfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/linuxserver/baseimage-alpine:3.13 as buildstage
1+
FROM ghcr.io/linuxserver/baseimage-alpine:3.15 as buildstage
22

33
ARG DOTNET_VERSIONS
44

@@ -16,20 +16,20 @@ RUN \
1616
for i in $DOTNET_VERSIONS; do \
1717
echo "processing version ${i}" && \
1818
DOTNET_RELEASE_URL=$(echo "${DOTNET_JSON}" | jq -r ".\"releases-index\"[] | select(.\"latest-sdk\"==\"${i}\") | .\"releases.json\"") && \
19-
DOTNET_RELEASE_JSON=$(curl -sX GET "${DOTNET_RELEASE_URL}") && \
19+
DOTNET_RELEASE_JSON=$(curl -fSsLX GET "${DOTNET_RELEASE_URL}") && \
2020
AMD64_URL=$(echo "${DOTNET_RELEASE_JSON}" | jq -r ".releases[] | select(.sdk.version==\"${i}\") | .sdk.files[] | select(.name | contains(\"linux-x64.tar.gz\")) | .url") && \
2121
ARM32_URL=$(echo "${DOTNET_RELEASE_JSON}" | jq -r ".releases[] | select(.sdk.version==\"${i}\") | .sdk.files[] | select(.name | contains(\"linux-arm.tar.gz\")) | .url") && \
2222
ARM64_URL=$(echo "${DOTNET_RELEASE_JSON}" | jq -r ".releases[] | select(.sdk.version==\"${i}\") | .sdk.files[] | select(.name | contains(\"linux-arm64.tar.gz\")) | .url") && \
23-
curl -fS --retry 3 --retry-connrefused -o \
23+
curl -fSL --retry 3 --retry-connrefused -o \
2424
/root-layer/dotnet/dotnetsdk_"${i}"_x86_64.tar.gz -L \
2525
"${AMD64_URL}" && \
26-
curl -fS --retry 3 --retry-connrefused -o \
26+
curl -fSL --retry 3 --retry-connrefused -o \
2727
/root-layer/dotnet/dotnetsdk_"${i}"_armv7l.tar.gz -L \
2828
"${ARM32_URL}" && \
29-
curl -fS --retry 3 --retry-connrefused -o \
29+
curl -fSL --retry 3 --retry-connrefused -o \
3030
/root-layer/dotnet/dotnetsdk_"${i}"_aarch64.tar.gz -L \
31-
"${ARM64_URL}"; \
32-
done
31+
"${ARM64_URL}" || exit 1; \
32+
done
3333

3434
COPY root/ /root-layer/
3535

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
# .NET Core SDK - Docker mod for code server
1+
# .NET Core SDK - Docker mod for code-server/openvscode-server
22

3-
This mod adds .NET CORE SDK to code server.
3+
This mod adds .NET CORE SDK to code-server and openvscode-server.
44

5-
In code server docker arguments, set an environment variable `DOCKER_MODS=linuxserver/mods:code-server-dotnet`
5+
In code-server/openvscode-server docker arguments, set an environment variable `DOCKER_MODS=linuxserver/mods:code-server-dotnet`
66

77
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`
88

root/etc/cont-init.d/95-apt-get

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/usr/bin/with-contenv bash
2+
3+
apt-get update

root/etc/cont-init.d/98-dotnet

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
# Determine if setup is needed
44
if [ -d /dotnet ]; then
5+
# install deps
6+
apt-get install -y libicu66
57
# remove existing install if updating
68
if ls -d /dotnet_* >/dev/null 2>&1; then
79
echo "deleting" $(ls -d /dotnet_*)

0 commit comments

Comments
 (0)