#!/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)
source "$(dirname "$0")/buildah-common"
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/
# 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
# 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
+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