From 704b31e0afa43b3cfe4ec9d401bb749a3a544c7a Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Tue, 5 Jan 2021 17:40:16 +0100 Subject: [PATCH] ci: provide correct build args ARCH and TRIPLET for Alpine Docker image builds --- .gitlab-ci.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9e3c91924..ca2636471 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -293,7 +293,7 @@ packaging:rpm: - docker buildx create --use --name cross-platform-build - docker buildx inspect --bootstrap cross-platform-build script: - - docker buildx build + - docker buildx build ${DOCKER_OPTS} --target app --platform ${PLATFORM} --file packaging/docker/Dockerfile.alpine @@ -313,12 +313,16 @@ packaging:docker:arm64: variables: PLATFORM: linux/arm64 DOCKER_TAG: ${CI_COMMIT_REF_NAME}-arm64 + DOCKER_OPTS: --build-arg ARCH=arm64 + --build-arg TRIPLET=aarch64-linux-gnu packaging:docker:armv7: <<: *packaging_docker variables: PLATFORM: linux/arm/v7 DOCKER_TAG: ${CI_COMMIT_REF_NAME}-armv7 + DOCKER_OPTS: --build-arg ARCH=armhf + --build-arg TRIPLET=arm-linux-gnueabihf # Stage: deploy ##############################################################################