Merge pull request #188 from product-os/fix-armv6hf-base-image

Use the belanalib/rpi-{alpine|debian} base image for armv6hf builds
product-os · Apr 17, 2024 · 787fc25 · 787fc25
2 parents 6198701 + d6463ac
commit 787fc25
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -121,6 +121,7 @@ jobs:
             DISTRO=${{ env.DISTRO }}
             BALENA_ARCH=${{ env.ARCH }}
             NODE_VERSION=${{ env.NODE_VERSION }}
+            BALENALIB_ARCH=${{ env.ARCH == 'armv6hf' && 'rpi' || env.ARCH }}
 
       # https://github.com/unfor19/install-aws-cli-action
       - name: setup awscli

diff --git a/Dockerfile b/Dockerfile
@@ -1,14 +1,15 @@
 ARG BALENA_ARCH=%%BALENA_ARCH%%
+ARG BALENALIB_ARCH=%%BALENA_ARCH%%
 ARG DISTRO=debian
 
-FROM balenalib/${BALENA_ARCH}-debian:buster-build AS debian
+FROM balenalib/${BALENALIB_ARCH}-debian:buster-build AS debian
 
 ARG BALENA_ARCH=%%BALENA_ARCH%%
 ENV BUILD_FLAGS='--prefix=/'
 ENV DEST_DIR=node-v${NODE_VERSION}-linux-${BALENA_ARCH}
 ENV TAR_FILE=node-v${NODE_VERSION}-linux-${BALENA_ARCH}.tar.gz
 
-FROM balenalib/${BALENA_ARCH}-alpine:3.18-build AS alpine
+FROM balenalib/${BALENALIB_ARCH}-alpine:3.18-build AS alpine
 
 ARG BALENA_ARCH=%%BALENA_ARCH%%
 ENV BUILD_FLAGS='--prefix=/ --shared-zlib'