Fix

theohbrothers · Sep 24, 2023 · 75737ed · 75737ed
1 parent 6fb7189
commit 75737ed
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/generate/templates/Dockerfile.ps1 b/generate/templates/Dockerfile.ps1
@@ -195,7 +195,7 @@ RUN --mount=type=secret,id=GITHUB_TOKEN \
     DEPS='alpine-sdk bash libstdc++ libc6-compat python3' \
     && apk add --no-cache `$DEPS \
     # Constraint to npm 8, or else npm will fail with 'npm ERR! `python` is not a valid npm option'. See: https://stackoverflow.com/questions/74522956/python-is-not-a-valid-npm-option and https://jubianchi.github.io/semver-check/#/~8/8
-    && apk add --no-cache 'npm~8' 'nodejs~16' \
+    && apk add --no-cache $( if ([version]$VARIANT['_metadata']['package_version'] -ge [version]'4.17') { "--repository=https://dl-cdn.alpinelinux.org/alpine/v3.18/main npm~8 nodejs~18" } else { "'npm~8' 'nodejs~16'" } ) \
     && npm config set python python3 \
     && GITHUB_TOKEN=`$( cat /run/secrets/GITHUB_TOKEN ) npm install --global code-server@$( $VARIANT['_metadata']['package_version'] ) --unsafe-perm \
     # Fix missing dependencies. See: https://github.com/coder/code-server/issues/5530

diff --git a/variants/v4.17.0-alpine-3.15/Dockerfile b/variants/v4.17.0-alpine-3.15/Dockerfile
@@ -22,7 +22,7 @@ RUN --mount=type=secret,id=GITHUB_TOKEN \
     DEPS='alpine-sdk bash libstdc++ libc6-compat python3' \
     && apk add --no-cache $DEPS \
     # Constraint to npm 8, or else npm will fail with 'npm ERR! python is not a valid npm option'. See: https://stackoverflow.com/questions/74522956/python-is-not-a-valid-npm-option and https://jubianchi.github.io/semver-check/#/~8/8
-    && apk add --no-cache 'npm~8' 'nodejs~16' \
+    && apk add --no-cache --repository=https://dl-cdn.alpinelinux.org/alpine/v3.18/main npm~8 nodejs~18 \
     && npm config set python python3 \
     && GITHUB_TOKEN=$( cat /run/secrets/GITHUB_TOKEN ) npm install --global code-server@4.17.0 --unsafe-perm \
     # Fix missing dependencies. See: https://github.com/coder/code-server/issues/5530

diff --git a/variants/v4.17.0-docker-alpine-3.15/Dockerfile b/variants/v4.17.0-docker-alpine-3.15/Dockerfile
@@ -22,7 +22,7 @@ RUN --mount=type=secret,id=GITHUB_TOKEN \
     DEPS='alpine-sdk bash libstdc++ libc6-compat python3' \
     && apk add --no-cache $DEPS \
     # Constraint to npm 8, or else npm will fail with 'npm ERR! python is not a valid npm option'. See: https://stackoverflow.com/questions/74522956/python-is-not-a-valid-npm-option and https://jubianchi.github.io/semver-check/#/~8/8
-    && apk add --no-cache 'npm~8' 'nodejs~16' \
+    && apk add --no-cache --repository=https://dl-cdn.alpinelinux.org/alpine/v3.18/main npm~8 nodejs~18 \
     && npm config set python python3 \
     && GITHUB_TOKEN=$( cat /run/secrets/GITHUB_TOKEN ) npm install --global code-server@4.17.0 --unsafe-perm \
     # Fix missing dependencies. See: https://github.com/coder/code-server/issues/5530

diff --git a/variants/v4.17.0-docker-rootless-alpine-3.15/Dockerfile b/variants/v4.17.0-docker-rootless-alpine-3.15/Dockerfile
@@ -22,7 +22,7 @@ RUN --mount=type=secret,id=GITHUB_TOKEN \
     DEPS='alpine-sdk bash libstdc++ libc6-compat python3' \
     && apk add --no-cache $DEPS \
     # Constraint to npm 8, or else npm will fail with 'npm ERR! python is not a valid npm option'. See: https://stackoverflow.com/questions/74522956/python-is-not-a-valid-npm-option and https://jubianchi.github.io/semver-check/#/~8/8
-    && apk add --no-cache 'npm~8' 'nodejs~16' \
+    && apk add --no-cache --repository=https://dl-cdn.alpinelinux.org/alpine/v3.18/main npm~8 nodejs~18 \
     && npm config set python python3 \
     && GITHUB_TOKEN=$( cat /run/secrets/GITHUB_TOKEN ) npm install --global code-server@4.17.0 --unsafe-perm \
     # Fix missing dependencies. See: https://github.com/coder/code-server/issues/5530