summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Daudt <kdaudt@alpinelinux.org>2021-12-18 20:10:12 +0100
committerTimo Teräs <timo.teras@iki.fi>2021-12-20 14:01:09 +0200
commit6969d824b1f1351a03423bc767f974ddcbde32f2 (patch)
treef45535231a75e72a2047d6e5c546bb9a54f9cff5
parentb39ebd2f840c6195ec48a1afc9a2c2e664aada9c (diff)
downloadapk-tools-6969d824b1f1351a03423bc767f974ddcbde32f2.tar.gz
apk-tools-6969d824b1f1351a03423bc767f974ddcbde32f2.tar.bz2
apk-tools-6969d824b1f1351a03423bc767f974ddcbde32f2.tar.xz
apk-tools-6969d824b1f1351a03423bc767f974ddcbde32f2.zip
ci: use arch-tagged images for static build
For 32-bits arches, we use 64-bit arches in 32-bit mode. Docker by default wants to pull the image for the native arch, so unless we take care, the binaries will be built for the wrong arch. Use the arch tagged images we build to make sure we get the correct image.
-rw-r--r--.gitlab-ci.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 925316f..055bde7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -33,7 +33,7 @@ test:debian:
build-static:
stage: build
- image: alpinelinux/build-base
+ image: alpinelinux/build-base:latest-$ARCH
script:
- abuild-apk add make gcc git musl-dev openssl-dev linux-headers zlib-dev lua5.3-dev lua5.3-lzlib zlib-static openssl-libs-static
- make -j$(nproc) static