X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=inline;f=dist%2Fcontainers%2Fargeo2-node;h=839d3cdb5d4d975707697fc6a8507a475435ceeb;hb=959b235c0d90c290f5bc78753156ca6bf14740cc;hp=3e0da2ced98c520c31bd710e6b2ca02fdf53362b;hpb=2e69fbd91b564d534f7bb5baa30774cdc35427ff;p=lgpl%2Fargeo-commons.git

diff --git a/dist/containers/argeo2-node b/dist/containers/argeo2-node
index 3e0da2ced..839d3cdb5 100755
--- a/dist/containers/argeo2-node
+++ b/dist/containers/argeo2-node
@@ -1,6 +1,12 @@
 #!/bin/sh
 
-container=$(buildah from argeo2-tp)
+source "$(dirname "$0")/buildah-metadata"
+container=$(buildah from argeo/argeo2-tp:$VERSION_ARGEO_TP)
+
+# Override version
+VERSION=2.1.84
+#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"
 
@@ -8,17 +14,21 @@ buildah config --label release="1" $container
 buildah config --label version="$VERSION" $container
 
 # Metadata
-buildah config --label name="argeo2-openjdk11-ubi8" $container
-buildah config --label summary="Argeo 2 Node based on OpenJDK 11 and Red Hat UBI 8" $container
-
-# Required as long as we declare an 'argeo' user
-buildah run $container -- microdnf install shadow-utils
+buildah config --label name="argeo2-node" $container
+buildah config --label description="Argeo 2 Node" $container
+buildah config --label url=https://hub.docker.com/repository/docker/argeo/argeo2-node $container
 
 # 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 $container 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