From 68d5a903d8aaab14ff720500a336435e8dac7b7d Mon Sep 17 00:00:00 2001 From: Leonard Jonathan Oh Date: Sat, 2 Nov 2024 12:01:54 +0000 Subject: [PATCH] Fix: Fix broken >= 4.90.x builds --- generate/templates/Dockerfile.ps1 | 12 ++++++++++-- variants/4.90.3-docker-go-1.20.14/Dockerfile | 2 +- .../4.90.3-docker-rootless-go-1.20.14/Dockerfile | 2 +- variants/4.90.3-docker-rootless/Dockerfile | 2 +- variants/4.90.3-docker/Dockerfile | 2 +- variants/4.90.3/Dockerfile | 2 +- variants/4.91.1-docker-go-1.20.14/Dockerfile | 2 +- .../4.91.1-docker-rootless-go-1.20.14/Dockerfile | 2 +- variants/4.91.1-docker-rootless/Dockerfile | 2 +- variants/4.91.1-docker/Dockerfile | 2 +- variants/4.91.1/Dockerfile | 2 +- variants/4.92.2-docker-go-1.20.14/Dockerfile | 2 +- .../4.92.2-docker-rootless-go-1.20.14/Dockerfile | 2 +- variants/4.92.2-docker-rootless/Dockerfile | 2 +- variants/4.92.2-docker/Dockerfile | 2 +- variants/4.92.2/Dockerfile | 2 +- variants/4.93.1-docker-go-1.20.14/Dockerfile | 2 +- .../4.93.1-docker-rootless-go-1.20.14/Dockerfile | 2 +- variants/4.93.1-docker-rootless/Dockerfile | 2 +- variants/4.93.1-docker/Dockerfile | 2 +- variants/4.93.1/Dockerfile | 2 +- 21 files changed, 30 insertions(+), 22 deletions(-) diff --git a/generate/templates/Dockerfile.ps1 b/generate/templates/Dockerfile.ps1 index 212e364..be49c4a 100644 --- a/generate/templates/Dockerfile.ps1 +++ b/generate/templates/Dockerfile.ps1 @@ -54,9 +54,17 @@ if ([version]$VARIANT['_metadata']['package_version'] -ge [version]'4.90') { # Use 'NODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT' to fix node 18.20 and 20.12 making experimental API the default, which breaks builds # Use '-U_FORTIFY_SOURCE' to fix vsnprintf errors in alpine: https://gitlab.alpinelinux.org/alpine/aports/-/issues/8626 # Use '-DUSE_IPO=OFF -DWHOLE_PROGRAM_OPTIMISATION=OFF' to fix lto-wrapper errors? - ( set +x; export GITHUB_TOKEN=`$( cat /run/secrets/GITHUB_TOKEN ); set -x; CXXFLAGS='-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT$( if ([version]$VARIANT['_metadata']['package_version'] -ge [version]'4.90') { ' -U_FORTIFY_SOURCE' } )' npm install --global code-server@$( $VARIANT['_metadata']['package_version'] ) --unsafe-perm ); \ + ( set +x; export GITHUB_TOKEN=`$( cat /run/secrets/GITHUB_TOKEN ); set -x; CXXFLAGS='-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT$( + if ([version]$VARIANT['_metadata']['package_version'] -ge [version]'4.90') { + ' -U_FORTIFY_SOURCE' + } + )' npm install --global code-server@$( $VARIANT['_metadata']['package_version'] ) --unsafe-perm ); \ # Fix missing dependencies. See: https://github.com/coder/code-server/issues/5530 - ( cd /usr/local/lib/node_modules/code-server/lib/vscode; set +x; export GITHUB_TOKEN=`$( cat /run/secrets/GITHUB_TOKEN ); set -x; CXXFLAGS='-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT' npm install --legacy-peer-deps ); \ + ( cd /usr/local/lib/node_modules/code-server/lib/vscode; set +x; export GITHUB_TOKEN=`$( cat /run/secrets/GITHUB_TOKEN ); set -x; CXXFLAGS='-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT$( + if ([version]$VARIANT['_metadata']['package_version'] -ge [version]'4.90') { + ' -U_FORTIFY_SOURCE' + } + )' npm install --legacy-peer-deps ); \ code-server --version; \ apk del `$DEPS diff --git a/variants/4.90.3-docker-go-1.20.14/Dockerfile b/variants/4.90.3-docker-go-1.20.14/Dockerfile index 3dc8ca6..8c6e4fe 100644 --- a/variants/4.90.3-docker-go-1.20.14/Dockerfile +++ b/variants/4.90.3-docker-go-1.20.14/Dockerfile @@ -37,7 +37,7 @@ RUN --mount=type=secret,id=GITHUB_TOKEN \ # Use '-DUSE_IPO=OFF -DWHOLE_PROGRAM_OPTIMISATION=OFF' to fix lto-wrapper errors? ( set +x; export GITHUB_TOKEN=$( cat /run/secrets/GITHUB_TOKEN ); set -x; CXXFLAGS='-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT -U_FORTIFY_SOURCE' npm install --global code-server@4.90.3 --unsafe-perm ); \ # Fix missing dependencies. See: https://github.com/coder/code-server/issues/5530 - ( cd /usr/local/lib/node_modules/code-server/lib/vscode; set +x; export GITHUB_TOKEN=$( cat /run/secrets/GITHUB_TOKEN ); set -x; CXXFLAGS='-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT' npm install --legacy-peer-deps ); \ + ( cd /usr/local/lib/node_modules/code-server/lib/vscode; set +x; export GITHUB_TOKEN=$( cat /run/secrets/GITHUB_TOKEN ); set -x; CXXFLAGS='-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT -U_FORTIFY_SOURCE' npm install --legacy-peer-deps ); \ code-server --version; \ apk del $DEPS diff --git a/variants/4.90.3-docker-rootless-go-1.20.14/Dockerfile b/variants/4.90.3-docker-rootless-go-1.20.14/Dockerfile index f264143..b58f63a 100644 --- a/variants/4.90.3-docker-rootless-go-1.20.14/Dockerfile +++ b/variants/4.90.3-docker-rootless-go-1.20.14/Dockerfile @@ -37,7 +37,7 @@ RUN --mount=type=secret,id=GITHUB_TOKEN \ # Use '-DUSE_IPO=OFF -DWHOLE_PROGRAM_OPTIMISATION=OFF' to fix lto-wrapper errors? ( set +x; export GITHUB_TOKEN=$( cat /run/secrets/GITHUB_TOKEN ); set -x; CXXFLAGS='-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT -U_FORTIFY_SOURCE' npm install --global code-server@4.90.3 --unsafe-perm ); \ # Fix missing dependencies. See: https://github.com/coder/code-server/issues/5530 - ( cd /usr/local/lib/node_modules/code-server/lib/vscode; set +x; export GITHUB_TOKEN=$( cat /run/secrets/GITHUB_TOKEN ); set -x; CXXFLAGS='-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT' npm install --legacy-peer-deps ); \ + ( cd /usr/local/lib/node_modules/code-server/lib/vscode; set +x; export GITHUB_TOKEN=$( cat /run/secrets/GITHUB_TOKEN ); set -x; CXXFLAGS='-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT -U_FORTIFY_SOURCE' npm install --legacy-peer-deps ); \ code-server --version; \ apk del $DEPS diff --git a/variants/4.90.3-docker-rootless/Dockerfile b/variants/4.90.3-docker-rootless/Dockerfile index c3ba21f..5c46930 100644 --- a/variants/4.90.3-docker-rootless/Dockerfile +++ b/variants/4.90.3-docker-rootless/Dockerfile @@ -37,7 +37,7 @@ RUN --mount=type=secret,id=GITHUB_TOKEN \ # Use '-DUSE_IPO=OFF -DWHOLE_PROGRAM_OPTIMISATION=OFF' to fix lto-wrapper errors? ( set +x; export GITHUB_TOKEN=$( cat /run/secrets/GITHUB_TOKEN ); set -x; CXXFLAGS='-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT -U_FORTIFY_SOURCE' npm install --global code-server@4.90.3 --unsafe-perm ); \ # Fix missing dependencies. See: https://github.com/coder/code-server/issues/5530 - ( cd /usr/local/lib/node_modules/code-server/lib/vscode; set +x; export GITHUB_TOKEN=$( cat /run/secrets/GITHUB_TOKEN ); set -x; CXXFLAGS='-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT' npm install --legacy-peer-deps ); \ + ( cd /usr/local/lib/node_modules/code-server/lib/vscode; set +x; export GITHUB_TOKEN=$( cat /run/secrets/GITHUB_TOKEN ); set -x; CXXFLAGS='-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT -U_FORTIFY_SOURCE' npm install --legacy-peer-deps ); \ code-server --version; \ apk del $DEPS diff --git a/variants/4.90.3-docker/Dockerfile b/variants/4.90.3-docker/Dockerfile index d963561..642a51a 100644 --- a/variants/4.90.3-docker/Dockerfile +++ b/variants/4.90.3-docker/Dockerfile @@ -37,7 +37,7 @@ RUN --mount=type=secret,id=GITHUB_TOKEN \ # Use '-DUSE_IPO=OFF -DWHOLE_PROGRAM_OPTIMISATION=OFF' to fix lto-wrapper errors? ( set +x; export GITHUB_TOKEN=$( cat /run/secrets/GITHUB_TOKEN ); set -x; CXXFLAGS='-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT -U_FORTIFY_SOURCE' npm install --global code-server@4.90.3 --unsafe-perm ); \ # Fix missing dependencies. See: https://github.com/coder/code-server/issues/5530 - ( cd /usr/local/lib/node_modules/code-server/lib/vscode; set +x; export GITHUB_TOKEN=$( cat /run/secrets/GITHUB_TOKEN ); set -x; CXXFLAGS='-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT' npm install --legacy-peer-deps ); \ + ( cd /usr/local/lib/node_modules/code-server/lib/vscode; set +x; export GITHUB_TOKEN=$( cat /run/secrets/GITHUB_TOKEN ); set -x; CXXFLAGS='-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT -U_FORTIFY_SOURCE' npm install --legacy-peer-deps ); \ code-server --version; \ apk del $DEPS diff --git a/variants/4.90.3/Dockerfile b/variants/4.90.3/Dockerfile index e365f28..e7cda89 100644 --- a/variants/4.90.3/Dockerfile +++ b/variants/4.90.3/Dockerfile @@ -37,7 +37,7 @@ RUN --mount=type=secret,id=GITHUB_TOKEN \ # Use '-DUSE_IPO=OFF -DWHOLE_PROGRAM_OPTIMISATION=OFF' to fix lto-wrapper errors? ( set +x; export GITHUB_TOKEN=$( cat /run/secrets/GITHUB_TOKEN ); set -x; CXXFLAGS='-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT -U_FORTIFY_SOURCE' npm install --global code-server@4.90.3 --unsafe-perm ); \ # Fix missing dependencies. See: https://github.com/coder/code-server/issues/5530 - ( cd /usr/local/lib/node_modules/code-server/lib/vscode; set +x; export GITHUB_TOKEN=$( cat /run/secrets/GITHUB_TOKEN ); set -x; CXXFLAGS='-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT' npm install --legacy-peer-deps ); \ + ( cd /usr/local/lib/node_modules/code-server/lib/vscode; set +x; export GITHUB_TOKEN=$( cat /run/secrets/GITHUB_TOKEN ); set -x; CXXFLAGS='-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT -U_FORTIFY_SOURCE' npm install --legacy-peer-deps ); \ code-server --version; \ apk del $DEPS diff --git a/variants/4.91.1-docker-go-1.20.14/Dockerfile b/variants/4.91.1-docker-go-1.20.14/Dockerfile index 2f66eaa..5cb6786 100644 --- a/variants/4.91.1-docker-go-1.20.14/Dockerfile +++ b/variants/4.91.1-docker-go-1.20.14/Dockerfile @@ -37,7 +37,7 @@ RUN --mount=type=secret,id=GITHUB_TOKEN \ # Use '-DUSE_IPO=OFF -DWHOLE_PROGRAM_OPTIMISATION=OFF' to fix lto-wrapper errors? ( set +x; export GITHUB_TOKEN=$( cat /run/secrets/GITHUB_TOKEN ); set -x; CXXFLAGS='-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT -U_FORTIFY_SOURCE' npm install --global code-server@4.91.1 --unsafe-perm ); \ # Fix missing dependencies. See: https://github.com/coder/code-server/issues/5530 - ( cd /usr/local/lib/node_modules/code-server/lib/vscode; set +x; export GITHUB_TOKEN=$( cat /run/secrets/GITHUB_TOKEN ); set -x; CXXFLAGS='-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT' npm install --legacy-peer-deps ); \ + ( cd /usr/local/lib/node_modules/code-server/lib/vscode; set +x; export GITHUB_TOKEN=$( cat /run/secrets/GITHUB_TOKEN ); set -x; CXXFLAGS='-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT -U_FORTIFY_SOURCE' npm install --legacy-peer-deps ); \ code-server --version; \ apk del $DEPS diff --git a/variants/4.91.1-docker-rootless-go-1.20.14/Dockerfile b/variants/4.91.1-docker-rootless-go-1.20.14/Dockerfile index e86f9a7..e20944f 100644 --- a/variants/4.91.1-docker-rootless-go-1.20.14/Dockerfile +++ b/variants/4.91.1-docker-rootless-go-1.20.14/Dockerfile @@ -37,7 +37,7 @@ RUN --mount=type=secret,id=GITHUB_TOKEN \ # Use '-DUSE_IPO=OFF -DWHOLE_PROGRAM_OPTIMISATION=OFF' to fix lto-wrapper errors? ( set +x; export GITHUB_TOKEN=$( cat /run/secrets/GITHUB_TOKEN ); set -x; CXXFLAGS='-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT -U_FORTIFY_SOURCE' npm install --global code-server@4.91.1 --unsafe-perm ); \ # Fix missing dependencies. See: https://github.com/coder/code-server/issues/5530 - ( cd /usr/local/lib/node_modules/code-server/lib/vscode; set +x; export GITHUB_TOKEN=$( cat /run/secrets/GITHUB_TOKEN ); set -x; CXXFLAGS='-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT' npm install --legacy-peer-deps ); \ + ( cd /usr/local/lib/node_modules/code-server/lib/vscode; set +x; export GITHUB_TOKEN=$( cat /run/secrets/GITHUB_TOKEN ); set -x; CXXFLAGS='-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT -U_FORTIFY_SOURCE' npm install --legacy-peer-deps ); \ code-server --version; \ apk del $DEPS diff --git a/variants/4.91.1-docker-rootless/Dockerfile b/variants/4.91.1-docker-rootless/Dockerfile index 2ca5f9d..5b5b62a 100644 --- a/variants/4.91.1-docker-rootless/Dockerfile +++ b/variants/4.91.1-docker-rootless/Dockerfile @@ -37,7 +37,7 @@ RUN --mount=type=secret,id=GITHUB_TOKEN \ # Use '-DUSE_IPO=OFF -DWHOLE_PROGRAM_OPTIMISATION=OFF' to fix lto-wrapper errors? ( set +x; export GITHUB_TOKEN=$( cat /run/secrets/GITHUB_TOKEN ); set -x; CXXFLAGS='-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT -U_FORTIFY_SOURCE' npm install --global code-server@4.91.1 --unsafe-perm ); \ # Fix missing dependencies. See: https://github.com/coder/code-server/issues/5530 - ( cd /usr/local/lib/node_modules/code-server/lib/vscode; set +x; export GITHUB_TOKEN=$( cat /run/secrets/GITHUB_TOKEN ); set -x; CXXFLAGS='-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT' npm install --legacy-peer-deps ); \ + ( cd /usr/local/lib/node_modules/code-server/lib/vscode; set +x; export GITHUB_TOKEN=$( cat /run/secrets/GITHUB_TOKEN ); set -x; CXXFLAGS='-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT -U_FORTIFY_SOURCE' npm install --legacy-peer-deps ); \ code-server --version; \ apk del $DEPS diff --git a/variants/4.91.1-docker/Dockerfile b/variants/4.91.1-docker/Dockerfile index 457b069..44c433b 100644 --- a/variants/4.91.1-docker/Dockerfile +++ b/variants/4.91.1-docker/Dockerfile @@ -37,7 +37,7 @@ RUN --mount=type=secret,id=GITHUB_TOKEN \ # Use '-DUSE_IPO=OFF -DWHOLE_PROGRAM_OPTIMISATION=OFF' to fix lto-wrapper errors? ( set +x; export GITHUB_TOKEN=$( cat /run/secrets/GITHUB_TOKEN ); set -x; CXXFLAGS='-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT -U_FORTIFY_SOURCE' npm install --global code-server@4.91.1 --unsafe-perm ); \ # Fix missing dependencies. See: https://github.com/coder/code-server/issues/5530 - ( cd /usr/local/lib/node_modules/code-server/lib/vscode; set +x; export GITHUB_TOKEN=$( cat /run/secrets/GITHUB_TOKEN ); set -x; CXXFLAGS='-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT' npm install --legacy-peer-deps ); \ + ( cd /usr/local/lib/node_modules/code-server/lib/vscode; set +x; export GITHUB_TOKEN=$( cat /run/secrets/GITHUB_TOKEN ); set -x; CXXFLAGS='-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT -U_FORTIFY_SOURCE' npm install --legacy-peer-deps ); \ code-server --version; \ apk del $DEPS diff --git a/variants/4.91.1/Dockerfile b/variants/4.91.1/Dockerfile index 854496b..422cb5b 100644 --- a/variants/4.91.1/Dockerfile +++ b/variants/4.91.1/Dockerfile @@ -37,7 +37,7 @@ RUN --mount=type=secret,id=GITHUB_TOKEN \ # Use '-DUSE_IPO=OFF -DWHOLE_PROGRAM_OPTIMISATION=OFF' to fix lto-wrapper errors? ( set +x; export GITHUB_TOKEN=$( cat /run/secrets/GITHUB_TOKEN ); set -x; CXXFLAGS='-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT -U_FORTIFY_SOURCE' npm install --global code-server@4.91.1 --unsafe-perm ); \ # Fix missing dependencies. See: https://github.com/coder/code-server/issues/5530 - ( cd /usr/local/lib/node_modules/code-server/lib/vscode; set +x; export GITHUB_TOKEN=$( cat /run/secrets/GITHUB_TOKEN ); set -x; CXXFLAGS='-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT' npm install --legacy-peer-deps ); \ + ( cd /usr/local/lib/node_modules/code-server/lib/vscode; set +x; export GITHUB_TOKEN=$( cat /run/secrets/GITHUB_TOKEN ); set -x; CXXFLAGS='-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT -U_FORTIFY_SOURCE' npm install --legacy-peer-deps ); \ code-server --version; \ apk del $DEPS diff --git a/variants/4.92.2-docker-go-1.20.14/Dockerfile b/variants/4.92.2-docker-go-1.20.14/Dockerfile index df0dc44..1096cf3 100644 --- a/variants/4.92.2-docker-go-1.20.14/Dockerfile +++ b/variants/4.92.2-docker-go-1.20.14/Dockerfile @@ -37,7 +37,7 @@ RUN --mount=type=secret,id=GITHUB_TOKEN \ # Use '-DUSE_IPO=OFF -DWHOLE_PROGRAM_OPTIMISATION=OFF' to fix lto-wrapper errors? ( set +x; export GITHUB_TOKEN=$( cat /run/secrets/GITHUB_TOKEN ); set -x; CXXFLAGS='-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT -U_FORTIFY_SOURCE' npm install --global code-server@4.92.2 --unsafe-perm ); \ # Fix missing dependencies. See: https://github.com/coder/code-server/issues/5530 - ( cd /usr/local/lib/node_modules/code-server/lib/vscode; set +x; export GITHUB_TOKEN=$( cat /run/secrets/GITHUB_TOKEN ); set -x; CXXFLAGS='-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT' npm install --legacy-peer-deps ); \ + ( cd /usr/local/lib/node_modules/code-server/lib/vscode; set +x; export GITHUB_TOKEN=$( cat /run/secrets/GITHUB_TOKEN ); set -x; CXXFLAGS='-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT -U_FORTIFY_SOURCE' npm install --legacy-peer-deps ); \ code-server --version; \ apk del $DEPS diff --git a/variants/4.92.2-docker-rootless-go-1.20.14/Dockerfile b/variants/4.92.2-docker-rootless-go-1.20.14/Dockerfile index 538daac..723aa55 100644 --- a/variants/4.92.2-docker-rootless-go-1.20.14/Dockerfile +++ b/variants/4.92.2-docker-rootless-go-1.20.14/Dockerfile @@ -37,7 +37,7 @@ RUN --mount=type=secret,id=GITHUB_TOKEN \ # Use '-DUSE_IPO=OFF -DWHOLE_PROGRAM_OPTIMISATION=OFF' to fix lto-wrapper errors? ( set +x; export GITHUB_TOKEN=$( cat /run/secrets/GITHUB_TOKEN ); set -x; CXXFLAGS='-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT -U_FORTIFY_SOURCE' npm install --global code-server@4.92.2 --unsafe-perm ); \ # Fix missing dependencies. See: https://github.com/coder/code-server/issues/5530 - ( cd /usr/local/lib/node_modules/code-server/lib/vscode; set +x; export GITHUB_TOKEN=$( cat /run/secrets/GITHUB_TOKEN ); set -x; CXXFLAGS='-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT' npm install --legacy-peer-deps ); \ + ( cd /usr/local/lib/node_modules/code-server/lib/vscode; set +x; export GITHUB_TOKEN=$( cat /run/secrets/GITHUB_TOKEN ); set -x; CXXFLAGS='-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT -U_FORTIFY_SOURCE' npm install --legacy-peer-deps ); \ code-server --version; \ apk del $DEPS diff --git a/variants/4.92.2-docker-rootless/Dockerfile b/variants/4.92.2-docker-rootless/Dockerfile index d7b1cb0..e65283a 100644 --- a/variants/4.92.2-docker-rootless/Dockerfile +++ b/variants/4.92.2-docker-rootless/Dockerfile @@ -37,7 +37,7 @@ RUN --mount=type=secret,id=GITHUB_TOKEN \ # Use '-DUSE_IPO=OFF -DWHOLE_PROGRAM_OPTIMISATION=OFF' to fix lto-wrapper errors? ( set +x; export GITHUB_TOKEN=$( cat /run/secrets/GITHUB_TOKEN ); set -x; CXXFLAGS='-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT -U_FORTIFY_SOURCE' npm install --global code-server@4.92.2 --unsafe-perm ); \ # Fix missing dependencies. See: https://github.com/coder/code-server/issues/5530 - ( cd /usr/local/lib/node_modules/code-server/lib/vscode; set +x; export GITHUB_TOKEN=$( cat /run/secrets/GITHUB_TOKEN ); set -x; CXXFLAGS='-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT' npm install --legacy-peer-deps ); \ + ( cd /usr/local/lib/node_modules/code-server/lib/vscode; set +x; export GITHUB_TOKEN=$( cat /run/secrets/GITHUB_TOKEN ); set -x; CXXFLAGS='-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT -U_FORTIFY_SOURCE' npm install --legacy-peer-deps ); \ code-server --version; \ apk del $DEPS diff --git a/variants/4.92.2-docker/Dockerfile b/variants/4.92.2-docker/Dockerfile index 82dbc9d..55935bf 100644 --- a/variants/4.92.2-docker/Dockerfile +++ b/variants/4.92.2-docker/Dockerfile @@ -37,7 +37,7 @@ RUN --mount=type=secret,id=GITHUB_TOKEN \ # Use '-DUSE_IPO=OFF -DWHOLE_PROGRAM_OPTIMISATION=OFF' to fix lto-wrapper errors? ( set +x; export GITHUB_TOKEN=$( cat /run/secrets/GITHUB_TOKEN ); set -x; CXXFLAGS='-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT -U_FORTIFY_SOURCE' npm install --global code-server@4.92.2 --unsafe-perm ); \ # Fix missing dependencies. See: https://github.com/coder/code-server/issues/5530 - ( cd /usr/local/lib/node_modules/code-server/lib/vscode; set +x; export GITHUB_TOKEN=$( cat /run/secrets/GITHUB_TOKEN ); set -x; CXXFLAGS='-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT' npm install --legacy-peer-deps ); \ + ( cd /usr/local/lib/node_modules/code-server/lib/vscode; set +x; export GITHUB_TOKEN=$( cat /run/secrets/GITHUB_TOKEN ); set -x; CXXFLAGS='-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT -U_FORTIFY_SOURCE' npm install --legacy-peer-deps ); \ code-server --version; \ apk del $DEPS diff --git a/variants/4.92.2/Dockerfile b/variants/4.92.2/Dockerfile index 73c0ad7..cba7d5b 100644 --- a/variants/4.92.2/Dockerfile +++ b/variants/4.92.2/Dockerfile @@ -37,7 +37,7 @@ RUN --mount=type=secret,id=GITHUB_TOKEN \ # Use '-DUSE_IPO=OFF -DWHOLE_PROGRAM_OPTIMISATION=OFF' to fix lto-wrapper errors? ( set +x; export GITHUB_TOKEN=$( cat /run/secrets/GITHUB_TOKEN ); set -x; CXXFLAGS='-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT -U_FORTIFY_SOURCE' npm install --global code-server@4.92.2 --unsafe-perm ); \ # Fix missing dependencies. See: https://github.com/coder/code-server/issues/5530 - ( cd /usr/local/lib/node_modules/code-server/lib/vscode; set +x; export GITHUB_TOKEN=$( cat /run/secrets/GITHUB_TOKEN ); set -x; CXXFLAGS='-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT' npm install --legacy-peer-deps ); \ + ( cd /usr/local/lib/node_modules/code-server/lib/vscode; set +x; export GITHUB_TOKEN=$( cat /run/secrets/GITHUB_TOKEN ); set -x; CXXFLAGS='-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT -U_FORTIFY_SOURCE' npm install --legacy-peer-deps ); \ code-server --version; \ apk del $DEPS diff --git a/variants/4.93.1-docker-go-1.20.14/Dockerfile b/variants/4.93.1-docker-go-1.20.14/Dockerfile index 3e35ee5..27cb23a 100644 --- a/variants/4.93.1-docker-go-1.20.14/Dockerfile +++ b/variants/4.93.1-docker-go-1.20.14/Dockerfile @@ -37,7 +37,7 @@ RUN --mount=type=secret,id=GITHUB_TOKEN \ # Use '-DUSE_IPO=OFF -DWHOLE_PROGRAM_OPTIMISATION=OFF' to fix lto-wrapper errors? ( set +x; export GITHUB_TOKEN=$( cat /run/secrets/GITHUB_TOKEN ); set -x; CXXFLAGS='-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT -U_FORTIFY_SOURCE' npm install --global code-server@4.93.1 --unsafe-perm ); \ # Fix missing dependencies. See: https://github.com/coder/code-server/issues/5530 - ( cd /usr/local/lib/node_modules/code-server/lib/vscode; set +x; export GITHUB_TOKEN=$( cat /run/secrets/GITHUB_TOKEN ); set -x; CXXFLAGS='-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT' npm install --legacy-peer-deps ); \ + ( cd /usr/local/lib/node_modules/code-server/lib/vscode; set +x; export GITHUB_TOKEN=$( cat /run/secrets/GITHUB_TOKEN ); set -x; CXXFLAGS='-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT -U_FORTIFY_SOURCE' npm install --legacy-peer-deps ); \ code-server --version; \ apk del $DEPS diff --git a/variants/4.93.1-docker-rootless-go-1.20.14/Dockerfile b/variants/4.93.1-docker-rootless-go-1.20.14/Dockerfile index 948cfcb..0e63e2f 100644 --- a/variants/4.93.1-docker-rootless-go-1.20.14/Dockerfile +++ b/variants/4.93.1-docker-rootless-go-1.20.14/Dockerfile @@ -37,7 +37,7 @@ RUN --mount=type=secret,id=GITHUB_TOKEN \ # Use '-DUSE_IPO=OFF -DWHOLE_PROGRAM_OPTIMISATION=OFF' to fix lto-wrapper errors? ( set +x; export GITHUB_TOKEN=$( cat /run/secrets/GITHUB_TOKEN ); set -x; CXXFLAGS='-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT -U_FORTIFY_SOURCE' npm install --global code-server@4.93.1 --unsafe-perm ); \ # Fix missing dependencies. See: https://github.com/coder/code-server/issues/5530 - ( cd /usr/local/lib/node_modules/code-server/lib/vscode; set +x; export GITHUB_TOKEN=$( cat /run/secrets/GITHUB_TOKEN ); set -x; CXXFLAGS='-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT' npm install --legacy-peer-deps ); \ + ( cd /usr/local/lib/node_modules/code-server/lib/vscode; set +x; export GITHUB_TOKEN=$( cat /run/secrets/GITHUB_TOKEN ); set -x; CXXFLAGS='-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT -U_FORTIFY_SOURCE' npm install --legacy-peer-deps ); \ code-server --version; \ apk del $DEPS diff --git a/variants/4.93.1-docker-rootless/Dockerfile b/variants/4.93.1-docker-rootless/Dockerfile index 47e927c..7121ca2 100644 --- a/variants/4.93.1-docker-rootless/Dockerfile +++ b/variants/4.93.1-docker-rootless/Dockerfile @@ -37,7 +37,7 @@ RUN --mount=type=secret,id=GITHUB_TOKEN \ # Use '-DUSE_IPO=OFF -DWHOLE_PROGRAM_OPTIMISATION=OFF' to fix lto-wrapper errors? ( set +x; export GITHUB_TOKEN=$( cat /run/secrets/GITHUB_TOKEN ); set -x; CXXFLAGS='-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT -U_FORTIFY_SOURCE' npm install --global code-server@4.93.1 --unsafe-perm ); \ # Fix missing dependencies. See: https://github.com/coder/code-server/issues/5530 - ( cd /usr/local/lib/node_modules/code-server/lib/vscode; set +x; export GITHUB_TOKEN=$( cat /run/secrets/GITHUB_TOKEN ); set -x; CXXFLAGS='-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT' npm install --legacy-peer-deps ); \ + ( cd /usr/local/lib/node_modules/code-server/lib/vscode; set +x; export GITHUB_TOKEN=$( cat /run/secrets/GITHUB_TOKEN ); set -x; CXXFLAGS='-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT -U_FORTIFY_SOURCE' npm install --legacy-peer-deps ); \ code-server --version; \ apk del $DEPS diff --git a/variants/4.93.1-docker/Dockerfile b/variants/4.93.1-docker/Dockerfile index 1531b0a..3e28275 100644 --- a/variants/4.93.1-docker/Dockerfile +++ b/variants/4.93.1-docker/Dockerfile @@ -37,7 +37,7 @@ RUN --mount=type=secret,id=GITHUB_TOKEN \ # Use '-DUSE_IPO=OFF -DWHOLE_PROGRAM_OPTIMISATION=OFF' to fix lto-wrapper errors? ( set +x; export GITHUB_TOKEN=$( cat /run/secrets/GITHUB_TOKEN ); set -x; CXXFLAGS='-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT -U_FORTIFY_SOURCE' npm install --global code-server@4.93.1 --unsafe-perm ); \ # Fix missing dependencies. See: https://github.com/coder/code-server/issues/5530 - ( cd /usr/local/lib/node_modules/code-server/lib/vscode; set +x; export GITHUB_TOKEN=$( cat /run/secrets/GITHUB_TOKEN ); set -x; CXXFLAGS='-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT' npm install --legacy-peer-deps ); \ + ( cd /usr/local/lib/node_modules/code-server/lib/vscode; set +x; export GITHUB_TOKEN=$( cat /run/secrets/GITHUB_TOKEN ); set -x; CXXFLAGS='-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT -U_FORTIFY_SOURCE' npm install --legacy-peer-deps ); \ code-server --version; \ apk del $DEPS diff --git a/variants/4.93.1/Dockerfile b/variants/4.93.1/Dockerfile index 564cbb9..35576fe 100644 --- a/variants/4.93.1/Dockerfile +++ b/variants/4.93.1/Dockerfile @@ -37,7 +37,7 @@ RUN --mount=type=secret,id=GITHUB_TOKEN \ # Use '-DUSE_IPO=OFF -DWHOLE_PROGRAM_OPTIMISATION=OFF' to fix lto-wrapper errors? ( set +x; export GITHUB_TOKEN=$( cat /run/secrets/GITHUB_TOKEN ); set -x; CXXFLAGS='-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT -U_FORTIFY_SOURCE' npm install --global code-server@4.93.1 --unsafe-perm ); \ # Fix missing dependencies. See: https://github.com/coder/code-server/issues/5530 - ( cd /usr/local/lib/node_modules/code-server/lib/vscode; set +x; export GITHUB_TOKEN=$( cat /run/secrets/GITHUB_TOKEN ); set -x; CXXFLAGS='-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT' npm install --legacy-peer-deps ); \ + ( cd /usr/local/lib/node_modules/code-server/lib/vscode; set +x; export GITHUB_TOKEN=$( cat /run/secrets/GITHUB_TOKEN ); set -x; CXXFLAGS='-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT -U_FORTIFY_SOURCE' npm install --legacy-peer-deps ); \ code-server --version; \ apk del $DEPS