From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 14 Dec 2019 09:22:16 +0000 (+0100)
Subject: Rename container scripts.
X-Git-Tag: argeo-commons-2.1.84~13
X-Git-Url: http://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=commitdiff_plain;h=c17e4d12382b233eef2c83baabdffb4a42725359

Rename container scripts.
---

diff --git a/dist/containers/argeo2-node b/dist/containers/argeo2-node
new file mode 100755
index 000000000..fbc4089c2
--- /dev/null
+++ b/dist/containers/argeo2-node
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+container=$(buildah from argeo2-tp)
+
+buildah config --label release="1" $container
+buildah config --label version="2.1.83,SNAPSHOT" $container
+
+source "$(dirname "$0")/buildah-common"
+
+# 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
+
+# Argeo Node
+buildah run $container -- microdnf install argeo-cms-e4-rap argeo-node
+
+# Configuration
+buildah config --entrypoint '["/usr/sbin/argeoctl","start"]' $container
+buildah config --port 8080 $container
+
+buildah commit $container argeo2-node:latest
diff --git a/dist/containers/argeo2-openjdk b/dist/containers/argeo2-openjdk
deleted file mode 100755
index fc64c865b..000000000
--- a/dist/containers/argeo2-openjdk
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-container=$(buildah from argeo2-tp-openjdk)
-
-buildah config --label release="1" $container
-buildah config --label version="2.1.83,SNAPSHOT" $container
-
-source "$(dirname "$0")/buildah-common"
-
-# 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
-
-# Argeo Node
-buildah run $container -- microdnf install argeo-cms-e4-rap argeo-node
-
-# Configuration
-buildah config --entrypoint '["/usr/sbin/argeoctl","start"]' $container
-buildah config --port 8080 $container
-
-buildah commit $container argeo2-node:latest
diff --git a/dist/containers/argeo2-tp b/dist/containers/argeo2-tp
new file mode 100755
index 000000000..cddfe97d1
--- /dev/null
+++ b/dist/containers/argeo2-tp
@@ -0,0 +1,29 @@
+#!/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-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
+
+# Java 11
+buildah run $container -- microdnf install java-11-openjdk-headless
+
+# 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
+
+# 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
diff --git a/dist/containers/argeo2-tp-openjdk b/dist/containers/argeo2-tp-openjdk
deleted file mode 100755
index cddfe97d1..000000000
--- a/dist/containers/argeo2-tp-openjdk
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/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-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
-
-# Java 11
-buildah run $container -- microdnf install java-11-openjdk-headless
-
-# 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
-
-# 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