From 959b235c0d90c290f5bc78753156ca6bf14740cc Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sat, 4 Jan 2020 23:46:39 +0100 Subject: [PATCH] Work on multi-arch containers --- dist/containers/argeo2-java | 8 ++++---- dist/containers/buildah-common | 3 +++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dist/containers/argeo2-java b/dist/containers/argeo2-java index 0724cd6cd..af25a56b6 100755 --- a/dist/containers/argeo2-java +++ b/dist/containers/argeo2-java @@ -20,7 +20,7 @@ buildah run $container -- microdnf clean all # Configuration buildah config --entrypoint '["java"]' $container -buildah commit --rm --format docker $container argeo/argeo2-java:openjdk-v$VERSION_JAVA -buildah tag argeo/argeo2-java:openjdk-v$VERSION_JAVA argeo/argeo2-java:latest -buildah push argeo/argeo2-java:openjdk-v$VERSION_JAVA docker://argeo/argeo2-java:openjdk-v$VERSION_JAVA -buildah push argeo/argeo2-java:openjdk-v$VERSION_JAVA docker://argeo/argeo2-java:latest +buildah commit --rm --format docker $container argeo/argeo2-java:openjdk-v$VERSION_JAVA-$ARCH +buildah tag argeo/argeo2-java:openjdk-v$VERSION_JAVA argeo/argeo2-java:$ARCH +buildah push argeo/argeo2-java:openjdk-v$VERSION_JAVA docker://argeo/argeo2-java:openjdk-v$VERSION_JAVA-$ARCH +buildah push argeo/argeo2-java:openjdk-v$VERSION_JAVA docker://argeo/argeo2-java:$ARCH diff --git a/dist/containers/buildah-common b/dist/containers/buildah-common index 0465d8717..f6dddcf7c 100755 --- a/dist/containers/buildah-common +++ b/dist/containers/buildah-common @@ -3,6 +3,9 @@ ## Log-in to Red Hat registry first # podman login registry.redhat.io +ARCH=`arch` +echo Building for architecture $ARCH + # Metadata buildah config --label maintainer="Mathieu Baudier, mbaudier at argeo.org" $container buildah config --created-by "Mathieu Baudier, mbaudier at argeo.org" $container -- 2.30.2