Support multi-architecture containers.

[lgpl/argeo-commons.git] / dist / containers / argeo2-builder

diff --git a/dist/containers/argeo2-builder b/dist/containers/argeo2-builder
index 4bb95f0290d334c72fd4eabe585e7734c53af161..055522bffbfd61433e66f81160ee7ec7eb9906f7 100755 (executable)
--- a/dist/containers/argeo2-builder
+++ b/dist/containers/argeo2-builder
@@ -1,12 +1,12 @@
 #!/bin/sh
 
 source "$(dirname "$0")/buildah-metadata"
-container=$(buildah from argeo/argeo2-java:openjdk-v$VERSION_JAVA)
+container=$(buildah from argeo/argeo2-java:openjdk-v$VERSION_JAVA-$ARCH)
 
 source "$(dirname "$0")/buildah-common"
 
 buildah config --label release="1" $container
-buildah config --label version="$VERSION" $container
+buildah config --label version="$VERSION_MAVEN" $container
 
 # Metadata
 buildah config --label name="argeo2-builder" $container
@@ -41,7 +41,7 @@ buildah config --workingdir /root/build/ $container
 # Perform a build of argeo-commons
 buildah copy $container ../.. /root/build
 buildah run $container -- mvn clean install
-buildah run $container -- mvn dependency:go-offline
+#buildah run $container -- mvn dependency:go-offline
 
 # Clean up build directories
 buildah run $container -- rm -rf /root/.m2/repository/org/argeo/commons
@@ -51,7 +51,8 @@ buildah run $container -- mkdir -p /root/build/
 # Configuration
 buildah config --entrypoint '["mvn","clean","install"]' $container
 
-buildah commit --rm --format docker $container argeo/argeo2-builder:maven-v$VERSION_MAVEN
-buildah tag argeo/argeo2-builder:maven-v$VERSION_MAVEN argeo/argeo2-builder:latest
-buildah push argeo/argeo2-builder:maven-v$VERSION_MAVEN docker://argeo/argeo2-builder:maven-v$VERSION_MAVEN
-buildah push argeo/argeo2-builder:maven-v$VERSION_MAVEN docker://argeo/argeo2-builder:latest
+buildah commit --rm --format docker $container argeo/argeo2-builder:maven-v$VERSION_MAVEN-$ARCH
+buildah tag argeo/argeo2-builder:maven-v$VERSION_MAVEN-$ARCH argeo/argeo2-builder:$ARCH
+
+buildah push argeo/argeo2-builder:maven-v$VERSION_MAVEN-$ARCH docker://argeo/argeo2-builder:maven-v$VERSION_MAVEN-$ARCH
+buildah push argeo/argeo2-builder:$ARCH docker://argeo/argeo2-builder:$ARCH