Improve containers build.

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

diff --git a/dist/containers/argeo2-tp b/dist/containers/argeo2-tp
index bf3994993fda5c883e7c00e819732ae8fc874baa..ecf60a0592e6d8bb89e904aaa5084c3973323db5 100755 (executable)
--- a/dist/containers/argeo2-tp
+++ b/dist/containers/argeo2-tp
@@ -1,7 +1,7 @@
 #!/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"
 
@@ -17,12 +17,14 @@ buildah config --label url=https://hub.docker.com/repository/docker/argeo/argeo2
 buildah run $container -- rpm -Uvh http://repo.argeo.org/rpm/argeo2-release-latest-7.noarch.rpm
 # Argeo Third Parties
 buildah run $container -- microdnf install argeo-cms-e4-rap-tp osgi-boot-equinox
+buildah run $container -- microdnf clean all
 
 # Configuration
 buildah config --entrypoint '["java","-Dosgi.bundles=org.argeo.osgi.boot.jar@start","-Dosgi.configuration=/var/lib/argeo/state","-Dosgi.data=/var/lib/argeo/data","-jar","/usr/share/osgi/boot/org.eclipse.osgi.jar","-console","2323"]' $container
 buildah config --workingdir /var/lib/argeo $container
 buildah config --volume /var/lib/argeo $container
 
-buildah commit --rm --format docker $container argeo2-tp:v$VERSION_ARGEO_TP
-buildah push argeo2-tp:v$VERSION_ARGEO_TP docker://argeo/argeo2-tp:v$VERSION_ARGEO_TP
-buildah push argeo2-tp:v$VERSION_ARGEO_TP docker://argeo/argeo2-tp:latest
+buildah commit --rm --format docker $container argeo/argeo2-tp:$VERSION_ARGEO_TP
+buildah tag argeo/argeo2-tp:$VERSION_ARGEO_TP argeo/argeo2-tp:latest
+buildah push argeo/argeo2-tp:$VERSION_ARGEO_TP docker://argeo/argeo2-tp:$VERSION_ARGEO_TP
+buildah push argeo/argeo2-tp:$VERSION_ARGEO_TP docker://argeo/argeo2-tp:latest