X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=dist%2Fcontainers%2Fargeo2-node;h=8578ab94a658fe5108547d73933d8cd37ec2a6ed;hb=c927a4902014165349575f9621bfe690c70cf67f;hp=1de18d6230c0f055c9df63e39b2b739dad77938a;hpb=41388b548207cb8de4867d91d141945c199fb1da;p=lgpl%2Fargeo-commons.git

diff --git a/dist/containers/argeo2-node b/dist/containers/argeo2-node
index 1de18d623..8578ab94a 100755
--- a/dist/containers/argeo2-node
+++ b/dist/containers/argeo2-node
@@ -1,26 +1,22 @@
 #!/bin/sh
 
 source "$(dirname "$0")/buildah-metadata"
-container=$(buildah from argeo/argeo2-tp:$VERSION_ARGEO_TP)
+container=$(buildah from argeo/argeo2-tp:$VERSION_ARGEO_TP-$ARCH)
 
 # 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"
 
 buildah config --label release="1" $container
-buildah config --label version="$VERSION" $container
+buildah config --label version="$VERSION_ARGEO_COMMONS" $container
 
 # Metadata
 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
 
-# Required as long as we declare an 'argeo' user
-buildah run $container -- microdnf install shadow-utils
-
 # Argeo Node
 buildah run $container -- microdnf install osgi-boot argeo-cms-e4-rap argeo-node
 buildah run $container -- microdnf clean all
@@ -31,7 +27,8 @@ buildah run $container -- microdnf clean all
 buildah config --entrypoint '["/usr/sbin/argeoctl","start"]' $container
 buildah config --port 8080 $container
 
-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
+buildah commit --rm --format docker $container argeo/argeo2-node:$VERSION_ARGEO_COMMONS-$ARCH
+buildah tag argeo/argeo2-node:$VERSION_ARGEO_COMMONS-$ARCH argeo/argeo2-node:$ARCH
+
+buildah push argeo/argeo2-node:$VERSION_ARGEO_COMMONS-$ARCH docker://argeo/argeo2-node:$VERSION_ARGEO_COMMONS-$ARCH
+buildah push argeo/argeo2-node:$ARCH docker://argeo/argeo2-node:$ARCH