From c56d7b9505ed15ebc593dbf477a03caecd217e99 Mon Sep 17 00:00:00 2001
From: cgeek <cem.moreau@gmail.com>
Date: Fri, 21 Jun 2024 13:11:35 +0200
Subject: [PATCH] fix(#195): arm64
---
.gitlab-ci.yml | 2 +-
docker/Dockerfile | 5 +----
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 331fbe4cf..ae290157c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -206,7 +206,7 @@ docker_deploy:
script:
- *define_network_branch_vars
- podman manifest rm "$MANIFEST" 2>/dev/null || true
- - podman build --layers --platform linux/amd64 --manifest "$MANIFEST" -f docker/Dockerfile --build-arg chain=$RUNTIME .
+ - podman build --layers --platform linux/amd64,linux/arm64 --manifest "$MANIFEST" -f docker/Dockerfile --build-arg chain=$RUNTIME .
- podman manifest push --all "$MANIFEST" "docker://docker.io/$IMAGE_NAME:$DOCKER_TAG"
- podman manifest push --all "$MANIFEST" "docker://docker.io/$IMAGE_NAME:latest"
after_script:
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 62f423629..4839f319f 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,6 +1,3 @@
-# Workaround for https://github.com/containers/buildah/issues/4742
-FROM debian:bullseye-slim as target
-
# ------------------------------------------------------------------------------
# Build Stage
# ------------------------------------------------------------------------------
@@ -68,7 +65,7 @@ RUN if [ "$cucumber" != 0 ] && [ "$TARGETPLATFORM" = "$BUILDPLATFORM" ]; then \
# Final Stage
# ------------------------------------------------------------------------------
-FROM target
+FROM debian:bullseye-slim
LABEL maintainer="Gilles Filippini <gilles.filippini@pini.fr>"
LABEL version="0.0.0"
--
GitLab