Work on multi-arch containers

diff --git a/dist/containers/argeo2-java b/dist/containers/argeo2-java
index 0724cd6cd276af1d6d214e608c1382fbec4104ce..af25a56b617a237403a67bd72cb7a21f0fe0a167 100755 (executable)
--- 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 0465d8717421c8cf20ea1d37aa98c191284fb027..f6dddcf7cd5c6e80ed5ba1abc0fc3e297a35e5cc 100755 (executable)
--- 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