fix

theohbrothers · Jan 2, 2023 · e9898ce · e9898ce
1 parent df9e49a
commit e9898ce
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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 \