X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=dist%2Fcontainers%2Fargeo2-builder;h=055522bffbfd61433e66f81160ee7ec7eb9906f7;hb=291c21e0e1759d4dad147694f2f6585b6a718d02;hp=994272568c32392ec44745b1830b2440f1c4a430;hpb=f0c115ab3b4d31ce6af04bba072229602196259f;p=lgpl%2Fargeo-commons.git

diff --git a/dist/containers/argeo2-builder b/dist/containers/argeo2-builder
index 994272568..055522bff 100755
--- a/dist/containers/argeo2-builder
+++ b/dist/containers/argeo2-builder
@@ -1,12 +1,12 @@
 #!/bin/sh
 
 source "$(dirname "$0")/buildah-metadata"
-container=$(buildah from 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
@@ -29,6 +29,8 @@ buildah run $container -- microdnf -y remove tar gzip
 buildah run $container -- ln -s /opt/apache-maven-$VERSION_MAVEN/bin/mvn /usr/local/bin/mvn
 # Maven script requires which
 buildah run $container -- microdnf -y install which
+# Clean microdnf
+buildah run $container -- microdnf clean all
 
 buildah run $container -- mkdir -p /srv/javafactory/
 
@@ -49,6 +51,8 @@ buildah run $container -- mkdir -p /root/build/
 # Configuration
 buildah config --entrypoint '["mvn","clean","install"]' $container
 
-buildah commit --rm --format docker $container argeo2-builder:maven-v$VERSION_MAVEN
-buildah push argeo2-builder:maven-v$VERSION_MAVEN docker://argeo/argeo2-builder:maven-v$VERSION_MAVEN
-buildah push 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