Improve containers build.

diff --git a/dist/containers/argeo2-builder b/dist/containers/argeo2-builder
index 994272568c32392ec44745b1830b2440f1c4a430..fff62be3f12683d30d24cb655a1b70cf89a36749 100755 (executable)
--- a/dist/containers/argeo2-builder
+++ b/dist/containers/argeo2-builder
@@ -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"
 
@@ -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,7 @@ 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
+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

diff --git a/dist/containers/argeo2-java b/dist/containers/argeo2-java
index 801d91947a090e50819daa885efd4ddc9cdb91fa..0724cd6cd276af1d6d214e608c1382fbec4104ce 100755 (executable)
--- a/dist/containers/argeo2-java
+++ b/dist/containers/argeo2-java
@@ -15,10 +15,12 @@ buildah config --label url=https://hub.docker.com/repository/docker/argeo/argeo2
 
 # Java 11
 buildah run $container -- microdnf install java-11-openjdk-headless
+buildah run $container -- microdnf clean all
 
 # Configuration
 buildah config --entrypoint '["java"]' $container
 
-buildah commit --rm --format docker $container argeo2-java:openjdk-v$VERSION_JAVA
-buildah push argeo2-java:openjdk-v$VERSION_JAVA docker://argeo/argeo2-java:openjdk-v$VERSION_JAVA
-buildah push argeo2-java:openjdk-v$VERSION_JAVA docker://argeo/argeo2-java:latest
+buildah commit --rm --format docker $container argeo/argeo2-java:openjdk-v$VERSION_JAVA
+buildah tag argeo/argeo2-java:openjdk-v$VERSION_JAVA argeo/argeo2-java:latest
+buildah push argeo/argeo2-java:openjdk-v$VERSION_JAVA docker://argeo/argeo2-java:openjdk-v$VERSION_JAVA
+buildah push argeo/argeo2-java:openjdk-v$VERSION_JAVA docker://argeo/argeo2-java:latest

diff --git a/dist/containers/argeo2-node b/dist/containers/argeo2-node
index c55747f6a4e768f3aac59c7cc0d85e49a14a7fed..1de18d6230c0f055c9df63e39b2b739dad77938a 100755 (executable)
--- a/dist/containers/argeo2-node
+++ b/dist/containers/argeo2-node
@@ -1,10 +1,12 @@
 #!/bin/sh
 
 source "$(dirname "$0")/buildah-metadata"
-container=$(buildah from argeo2-tp:v$VERSION_ARGEO_TP)
+container=$(buildah from argeo/argeo2-tp:$VERSION_ARGEO_TP)
 
 # Override version
 VERSION=2.1.83
+#buildah copy $container argeo2-rpmfactory.repo /etc/yum.repos.d/
+#buildah copy $container /srv/rpmfactory/argeo-osgi-2/el7/ /srv/rpmfactory/argeo-osgi-2/el7/
 
 source "$(dirname "$0")/buildah-common"
 
@@ -13,21 +15,23 @@ buildah config --label version="$VERSION" $container
 
 # Metadata
 buildah config --label name="argeo2-node" $container
-buildah config --label description="Argeo 2 Node based on OpenJDK 11 and Red Hat UBI 8" $container
+buildah config --label description="Argeo 2 Node" $container
 buildah config --label url=https://hub.docker.com/repository/docker/argeo/argeo2-node $container
 
 # Required as long as we declare an 'argeo' user
 buildah run $container -- microdnf install shadow-utils
 
-# Argeo OSGi Boot
-buildah run $container -- microdnf install osgi-boot
 # Argeo Node
-buildah run $container -- microdnf install argeo-cms-e4-rap argeo-node
+buildah run $container -- microdnf install osgi-boot argeo-cms-e4-rap argeo-node
+buildah run $container -- microdnf clean all
+
+#buildah run $container -- rm -rf /srv/rpmfactory/argeo-osgi-2
 
 # Configuration
 buildah config --entrypoint '["/usr/sbin/argeoctl","start"]' $container
 buildah config --port 8080 $container
 
-buildah commit --rm --format docker $container argeo2-node:v$VERSION
-buildah push argeo2-node:v$VERSION docker://argeo/argeo2-node:v$VERSION
-buildah push argeo2-node:v$VERSION docker://argeo/argeo2-node:latest
+buildah commit --rm --format docker $container argeo/argeo2-node:$VERSION
+buildah tag argeo/argeo2-node:$VERSION argeo/argeo2-node:latest
+buildah push argeo/argeo2-node:$VERSION docker://argeo/argeo2-node:$VERSION
+buildah push argeo/argeo2-node:$VERSION docker://argeo/argeo2-node:latest

diff --git a/dist/containers/argeo2-rpmfactory.repo b/dist/containers/argeo2-rpmfactory.repo
new file mode 100644 (file)
index 0000000..00445b6
--- /dev/null
+++ b/dist/containers/argeo2-rpmfactory.repo
@@ -0,0 +1,4 @@
+[argeo2-rpmfactory]
+baseurl=file:///srv/rpmfactory/argeo-osgi-2/el7/
+gpgcheck=0
+enabled=1

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