From: Mathieu Baudier <mbaudier@argeo.org>
Date: Mon, 6 Jan 2020 13:47:07 +0000 (+0100)
Subject: Explicit versions and registry logins.
X-Git-Tag: argeo-commons-2.1.85~40
X-Git-Url: http://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=commitdiff_plain;h=3ad90e4c9e48c63a0747fa71e2b7b6b308b1affb

Explicit versions and registry logins.
---

diff --git a/dist/containers/.gitignore b/dist/containers/.gitignore
index 88e2ba8cf..b83d22266 100644
--- a/dist/containers/.gitignore
+++ b/dist/containers/.gitignore
@@ -1,2 +1 @@
-/buildah-metadata
 /target/
diff --git a/dist/containers/buildah-common b/dist/containers/buildah-common
index 6e9002815..c91203254 100755
--- a/dist/containers/buildah-common
+++ b/dist/containers/buildah-common
@@ -1,9 +1,5 @@
 #!/bin/sh
 
-## Log-in to registries first
-# podman login registry.redhat.io
-# podman login docker.io
-
 # Metadata
 buildah config --label maintainer="Mathieu Baudier, mbaudier at argeo.org" $container
 buildah config --created-by "Mathieu Baudier, mbaudier at argeo.org" $container
diff --git a/dist/containers/buildah-login b/dist/containers/buildah-login
new file mode 100755
index 000000000..b0ea1f0bc
--- /dev/null
+++ b/dist/containers/buildah-login
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+echo Login to Red Hat registry (registry.redhat.io)
+podman login registry.redhat.io
+
+echo Login to Docker Hub registry (docker.io)
+podman login docker.io
+
diff --git a/dist/containers/buildah-metadata b/dist/containers/buildah-metadata
new file mode 100644
index 000000000..a65a87db6
--- /dev/null
+++ b/dist/containers/buildah-metadata
@@ -0,0 +1,8 @@
+VERSION_ARGEO_COMMONS=2.1.84
+VERSION_ARGEO_TP=2.1.27
+
+VERSION_MAVEN=3.5.4
+VERSION_JAVA=11.0.5
+
+ARCH=`arch`
+echo Building for architecture $ARCH
diff --git a/dist/containers/pom.xml b/dist/containers/pom.xml
index 2f1c52f30..2392385da 100644
--- a/dist/containers/pom.xml
+++ b/dist/containers/pom.xml
@@ -9,29 +9,29 @@
 	<artifactId>containers</artifactId>
 	<packaging>pom</packaging>
 	<name>Argeo OCI Containers</name>
-	<build>
-		<plugins>
-			<plugin>
-				<artifactId>maven-resources-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>copy-resources</id>
-						<phase>validate</phase>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${basedir}</outputDirectory>
-							<resources>
-								<resource>
-									<directory>filtered</directory>
-									<filtering>true</filtering>
-								</resource>
-							</resources>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
+<!-- 	<build> -->
+<!-- 		<plugins> -->
+<!-- 			<plugin> -->
+<!-- 				<artifactId>maven-resources-plugin</artifactId> -->
+<!-- 				<executions> -->
+<!-- 					<execution> -->
+<!-- 						<id>copy-resources</id> -->
+<!-- 						<phase>validate</phase> -->
+<!-- 						<goals> -->
+<!-- 							<goal>copy-resources</goal> -->
+<!-- 						</goals> -->
+<!-- 						<configuration> -->
+<!-- 							<outputDirectory>${basedir}</outputDirectory> -->
+<!-- 							<resources> -->
+<!-- 								<resource> -->
+<!-- 									<directory>filtered</directory> -->
+<!-- 									<filtering>true</filtering> -->
+<!-- 								</resource> -->
+<!-- 							</resources> -->
+<!-- 						</configuration> -->
+<!-- 					</execution> -->
+<!-- 				</executions> -->
+<!-- 			</plugin> -->
+<!-- 		</plugins> -->
+<!-- 	</build> -->
 </project>