Skip to content

Commit 8341fee

Browse files
committed
Use required version of NodeJS for latest version of code-server.
1 parent 676c90c commit 8341fee

File tree

5 files changed

+9
-17
lines changed

5 files changed

+9
-17
lines changed

code-server/Dockerfile

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,10 @@ RUN --mount=type=cache,id=code-server-apk-${TARGETARCH},sharing=locked,target=/v
8383
# renovate: datasource=github-releases depName=vscode packageName=coder/code-server
8484
ARG CODE_SERVER_VERSION=4.99.3
8585
RUN --mount=type=cache,id=code-server-npm-${TARGETARCH},sharing=locked,target=/root/.npm \
86-
CXXFLAGS='-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT -U_FORTIFY_SOURCE' npm install --global --unsafe-perm "code-server@${CODE_SERVER_VERSION}" && \
86+
mkdir -p /opt/code-server && \
87+
cd /opt/code-server && \
88+
CXXFLAGS='-U_FORTIFY_SOURCE' npm install --unsafe-perm "code-server@${CODE_SERVER_VERSION}" --verbose && \
89+
ln -s /opt/code-server/node_modules/.bin/code-server /usr/local/bin/code-server && \
8790
cleanup.sh
8891

8992
# Drush requires HOME to be set as such.
@@ -100,13 +103,13 @@ ENV \
100103
COPY --link rootfs /
101104

102105
# Install Editor plugins from bind mounted folder (Not available on online marketplace).
103-
RUN --mount=type=bind,source=/extensions,target=/extensions \
104-
declare -a PIDS=() EXTENSIONS=(/extensions/*.vsix); \
105-
EXTENSIONS+=(\
106+
RUN EXTENSIONS=(\
107+
augustocdias.tasks-shell-input \
106108
bmewburn.vscode-intelephense-client \
107109
felixfbecker.php-debug \
108-
streetsidesoftware.code-spell-checker \
109110
mblode.twig-language-2 \
111+
streetsidesoftware.code-spell-checker \
112+
ValeryanM.vscode-phpsab \
110113
) && \
111114
mkdir -p /opt/code-server/data /opt/code-server/extensions; \
112115
for extension in "${EXTENSIONS[@]}"; \

code-server/extensions/README.md

Lines changed: 0 additions & 11 deletions
This file was deleted.
-79.8 KB
Binary file not shown.
-843 KB
Binary file not shown.

docker-bake.hcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ target "code-server-common" {
311311
context = "code-server"
312312
contexts = {
313313
# Produced by this repository <https://github.com/Islandora-Devops/isle-nodejs>.
314-
nodejs = "docker-image://islandora/nodejs:alpine-3.20.2-nodejs-20.15.1-r0@sha256:4f377ed5bbb832c51ee9f4b898555ffae0dfdd21f4becc5ac7e26cdf235ed004"
314+
nodejs = "docker-image://islandora/nodejs:alpine-3.20.2-nodejs-20.18.3-r0@sha256:709e29832b5fb87278990ef462eb8197c4725e45902f5d716b7c9497db6521bb"
315315
}
316316
}
317317

0 commit comments

Comments
 (0)