From e9898cebee7d0c811acf85e148b4b7dd1c04bc65 Mon Sep 17 00:00:00 2001 From: Leonard Jonathan Oh Date: Mon, 2 Jan 2023 19:31:18 +0000 Subject: [PATCH] fix --- generate/templates/Dockerfile.ps1 | 4 ++-- variants/v4.6.1-alpine-3.15/Dockerfile | 4 ++-- variants/v4.7.1-alpine-3.15/Dockerfile | 4 ++-- variants/v4.8.3-alpine-3.15/Dockerfile | 4 ++-- variants/v4.9.1-alpine-3.15/Dockerfile | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/generate/templates/Dockerfile.ps1 b/generate/templates/Dockerfile.ps1 index 281bd4da..2f27374f 100644 --- a/generate/templates/Dockerfile.ps1 +++ b/generate/templates/Dockerfile.ps1 @@ -10,11 +10,11 @@ ARG BUILDPLATFORM RUN echo "I am running on `$BUILDPLATFORM, building for `$TARGETPLATFORM" RUN --mount=type=secret,id=GITHUB_TOKEN \ - DEPS='alpine-sdk bash libstdc++ libc6-compat python3' \ + DEPS='alpine-sdk bash libstdc++ libc6-compat python3 pkg-config' \ && apk add --no-cache `$DEPS \ && apk add --no-cache npm nodejs \ && npm config set python python3 \ - && export PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig/ \ + # && export PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig/ \ && 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 && cd /usr/local/lib/node_modules/code-server/lib/vscode && GITHUB_TOKEN=`$( cat /run/secrets/GITHUB_TOKEN ) npm install --legacy-peer-deps \ diff --git a/variants/v4.6.1-alpine-3.15/Dockerfile b/variants/v4.6.1-alpine-3.15/Dockerfile index 9de3dba0..cc736442 100644 --- a/variants/v4.6.1-alpine-3.15/Dockerfile +++ b/variants/v4.6.1-alpine-3.15/Dockerfile @@ -7,11 +7,11 @@ ARG BUILDPLATFORM RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM" RUN --mount=type=secret,id=GITHUB_TOKEN \ - DEPS='alpine-sdk bash libstdc++ libc6-compat python3' \ + DEPS='alpine-sdk bash libstdc++ libc6-compat python3 pkg-config' \ && apk add --no-cache $DEPS \ && apk add --no-cache npm nodejs \ && npm config set python python3 \ - && export PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig/ \ + # && export PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig/ \ && GITHUB_TOKEN=$( cat /run/secrets/GITHUB_TOKEN ) npm install --global code-server@4.6.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 && GITHUB_TOKEN=$( cat /run/secrets/GITHUB_TOKEN ) npm install --legacy-peer-deps \ diff --git a/variants/v4.7.1-alpine-3.15/Dockerfile b/variants/v4.7.1-alpine-3.15/Dockerfile index cc3f53f7..70dbec51 100644 --- a/variants/v4.7.1-alpine-3.15/Dockerfile +++ b/variants/v4.7.1-alpine-3.15/Dockerfile @@ -7,11 +7,11 @@ ARG BUILDPLATFORM RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM" RUN --mount=type=secret,id=GITHUB_TOKEN \ - DEPS='alpine-sdk bash libstdc++ libc6-compat python3' \ + DEPS='alpine-sdk bash libstdc++ libc6-compat python3 pkg-config' \ && apk add --no-cache $DEPS \ && apk add --no-cache npm nodejs \ && npm config set python python3 \ - && export PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig/ \ + # && export PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig/ \ && GITHUB_TOKEN=$( cat /run/secrets/GITHUB_TOKEN ) npm install --global code-server@4.7.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 && GITHUB_TOKEN=$( cat /run/secrets/GITHUB_TOKEN ) npm install --legacy-peer-deps \ diff --git a/variants/v4.8.3-alpine-3.15/Dockerfile b/variants/v4.8.3-alpine-3.15/Dockerfile index da66ae95..36a5a9e6 100644 --- a/variants/v4.8.3-alpine-3.15/Dockerfile +++ b/variants/v4.8.3-alpine-3.15/Dockerfile @@ -7,11 +7,11 @@ ARG BUILDPLATFORM RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM" RUN --mount=type=secret,id=GITHUB_TOKEN \ - DEPS='alpine-sdk bash libstdc++ libc6-compat python3' \ + DEPS='alpine-sdk bash libstdc++ libc6-compat python3 pkg-config' \ && apk add --no-cache $DEPS \ && apk add --no-cache npm nodejs \ && npm config set python python3 \ - && export PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig/ \ + # && export PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig/ \ && GITHUB_TOKEN=$( cat /run/secrets/GITHUB_TOKEN ) npm install --global code-server@4.8.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 && GITHUB_TOKEN=$( cat /run/secrets/GITHUB_TOKEN ) npm install --legacy-peer-deps \ diff --git a/variants/v4.9.1-alpine-3.15/Dockerfile b/variants/v4.9.1-alpine-3.15/Dockerfile index f270a81e..7b12b8ec 100644 --- a/variants/v4.9.1-alpine-3.15/Dockerfile +++ b/variants/v4.9.1-alpine-3.15/Dockerfile @@ -7,11 +7,11 @@ ARG BUILDPLATFORM RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM" RUN --mount=type=secret,id=GITHUB_TOKEN \ - DEPS='alpine-sdk bash libstdc++ libc6-compat python3' \ + DEPS='alpine-sdk bash libstdc++ libc6-compat python3 pkg-config' \ && apk add --no-cache $DEPS \ && apk add --no-cache npm nodejs \ && npm config set python python3 \ - && export PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig/ \ + # && export PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig/ \ && GITHUB_TOKEN=$( cat /run/secrets/GITHUB_TOKEN ) npm install --global code-server@4.9.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 && GITHUB_TOKEN=$( cat /run/secrets/GITHUB_TOKEN ) npm install --legacy-peer-deps \