Enhancement: Build multi-arch images

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

Hide file tree

Showing 7 changed files with 54 additions and 49 deletions.
diff --git a/.github/workflows/ci-master-pr.yml b/.github/workflows/ci-master-pr.yml
diff --git a/generate/definitions/VARIANTS.ps1 b/generate/definitions/VARIANTS.ps1
@@ -81,7 +81,7 @@ $VARIANTS = @(
                             $variant['distro_version']
                         ) -join '-'
                     }
-                    platforms = 'linux/amd64'
+                    platforms ='linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64'
                     components = $subVariant['components']
                 }
                 # Docker image tag. E.g. 'v2.3.0.0-alpine-3.6'

diff --git a/generate/templates/Dockerfile.ps1 b/generate/templates/Dockerfile.ps1
@@ -14,6 +14,7 @@ RUN --mount=type=secret,id=GITHUB_TOKEN \
     && 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/ \
     && 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
@@ -11,6 +11,7 @@ RUN --mount=type=secret,id=GITHUB_TOKEN \
     && 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/ \
     && 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
@@ -11,6 +11,7 @@ RUN --mount=type=secret,id=GITHUB_TOKEN \
     && 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/ \
     && 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
@@ -11,6 +11,7 @@ RUN --mount=type=secret,id=GITHUB_TOKEN \
     && 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/ \
     && 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
@@ -11,6 +11,7 @@ RUN --mount=type=secret,id=GITHUB_TOKEN \
     && 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/ \
     && 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 \