build: use docker's --platform arg

The arm64v8/ prefix for image naming doesn't appear to be working anymore for AlmaLinux.
jasonish · Jun 27, 2024 · 513ac8e · 513ac8e
1 parent e5f4e25
commit 513ac8e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/build-containers.sh b/build-containers.sh
@@ -95,15 +95,15 @@ manifests_pushed=()
 
 name="${DOCKER_NAME}:${tag}-amd64"
 ${ECHO} docker build \
-       --build-arg "BASE=amd64/almalinux:9-minimal" \
+       --platform linux/amd64 \
        --build-arg "SRC=./dist/evebox-${version}-linux-x64/evebox" \
        -t ${name} \
        -f docker/Dockerfile .
 tags_built+=(${name})
 
 name="${DOCKER_NAME}:${tag}-arm64v8"
 ${ECHO} docker build \
-       --build-arg "BASE=arm64v8/almalinux:9-minimal" \
+       --platform linux/arm64 \
        --build-arg "SRC=./dist/evebox-${version}-linux-arm64/evebox" \
        -t ${name} \
        -f docker/Dockerfile .

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -1,5 +1,4 @@
-ARG BASE
-FROM $BASE
+FROM almalinux:9-minimal
 
 ARG SRC="SRC_--build-arg_must_be_set"
 COPY $SRC /bin/evebox