Improve containers build.

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

diff --git a/dist/containers/argeo2-tp b/dist/containers/argeo2-tp
index cddfe97d1856063088059e27d9102df776a07d54..ecf60a0592e6d8bb89e904aaa5084c3973323db5 100755 (executable)
--- a/dist/containers/argeo2-tp
+++ b/dist/containers/argeo2-tp
@@ -1,29 +1,30 @@
 #!/bin/sh
 
-container=$(buildah from ubi8/ubi-minimal)
-
-buildah config --label release="1" $container
-buildah config --label version="2.1.25" $container
+source "$(dirname "$0")/buildah-metadata"
+container=$(buildah from argeo/argeo2-java:openjdk-v$VERSION_JAVA)
 
 source "$(dirname "$0")/buildah-common"
 
-# Metadata
-buildah config --label name="argeo2-tp-openjdk11-ubi8" $container
-buildah config --label summary="Argeo 2 OSGi Third Parties based on OpenJDK 11 and Red Hat UBI 8" $container
+buildah config --label release="1" $container
+buildah config --label version="$VERSION_ARGEO_TP" $container
 
-# Java 11
-buildah run $container -- microdnf install java-11-openjdk-headless
+# Metadata
+buildah config --label name="argeo2-tp" $container
+buildah config --label description="Argeo 2 OSGi Third Parties" $container
+buildah config --label url=https://hub.docker.com/repository/docker/argeo/argeo2-tp $container
 
 # Argeo
 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
-# Argeo OSGi Boot
-buildah run $container -- microdnf install osgi-boot
+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 $container 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