From 860697f86176e34bf953d64d8bc877eaf1a36a5d Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sun, 26 Dec 2021 08:06:59 +0100 Subject: [PATCH] Move container build scripts --- dist/containers/argeo2-all | 6 --- dist/containers/argeo2-builder | 58 ----------------------- dist/containers/argeo2-java | 28 ----------- dist/containers/argeo2-lists | 19 -------- dist/containers/argeo2-node | 34 ------------- dist/containers/argeo2-node-snapshots | 32 ------------- dist/containers/argeo2-rpmfactory.repo | 4 -- dist/containers/argeo2-snapshots.repo | 4 -- dist/containers/argeo2-tp | 31 ------------ dist/containers/buildah-common | 21 -------- dist/containers/buildah-login | 8 ---- dist/containers/buildah-metadata | 8 ---- dist/containers/dev-settings.sh | 2 - dist/containers/filtered/buildah-metadata | 8 ---- dist/containers/maven.conf | 1 - dist/containers/pom.xml | 37 --------------- dist/pom.xml | 1 - 17 files changed, 302 deletions(-) delete mode 100755 dist/containers/argeo2-all delete mode 100755 dist/containers/argeo2-builder delete mode 100755 dist/containers/argeo2-java delete mode 100755 dist/containers/argeo2-lists delete mode 100755 dist/containers/argeo2-node delete mode 100755 dist/containers/argeo2-node-snapshots delete mode 100644 dist/containers/argeo2-rpmfactory.repo delete mode 100644 dist/containers/argeo2-snapshots.repo delete mode 100755 dist/containers/argeo2-tp delete mode 100755 dist/containers/buildah-common delete mode 100755 dist/containers/buildah-login delete mode 100644 dist/containers/buildah-metadata delete mode 100644 dist/containers/dev-settings.sh delete mode 100644 dist/containers/filtered/buildah-metadata delete mode 100644 dist/containers/maven.conf delete mode 100644 dist/containers/pom.xml diff --git a/dist/containers/argeo2-all b/dist/containers/argeo2-all deleted file mode 100755 index 4ad00fa22..000000000 --- a/dist/containers/argeo2-all +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -./argeo2-java -./argeo2-tp -./argeo2-node -./argeo2-builder diff --git a/dist/containers/argeo2-builder b/dist/containers/argeo2-builder deleted file mode 100755 index 055522bff..000000000 --- a/dist/containers/argeo2-builder +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/sh - -source "$(dirname "$0")/buildah-metadata" -container=$(buildah from argeo/argeo2-java:openjdk-v$VERSION_JAVA-$ARCH) - -source "$(dirname "$0")/buildah-common" - -buildah config --label release="1" $container -buildah config --label version="$VERSION_MAVEN" $container - -# Metadata -buildah config --label name="argeo2-builder" $container -buildah config --label description="Argeo 2 Builder" $container - -# Utilities -#buildah run $container -- microdnf -y install git -# Java 11 -#buildah run $container -- microdnf -y install java-11-openjdk-devel -# Maven -#buildah run $container -- microdnf -y install maven -#buildah copy $container maven.conf /etc/java/maven.conf - -buildah run $container -- microdnf -y install tar gzip -buildah copy $container https://archive.apache.org/dist/maven/maven-3/$VERSION_MAVEN/binaries/apache-maven-$VERSION_MAVEN-bin.tar.gz /opt -buildah run $container -- tar -C /opt -xzf /opt/apache-maven-$VERSION_MAVEN-bin.tar.gz -buildah run $container -- rm -f /opt/apache-maven-$VERSION_MAVEN-bin.tar.gz -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/ - -# Working dir -buildah run $container -- mkdir -p /root/build/ -buildah config --workingdir /root/build/ $container - -# Perform a build of argeo-commons -buildah copy $container ../.. /root/build -buildah run $container -- mvn clean install -#buildah run $container -- mvn dependency:go-offline - -# Clean up build directories -buildah run $container -- rm -rf /root/.m2/repository/org/argeo/commons -buildah run $container -- rm -rf /root/build -buildah run $container -- mkdir -p /root/build/ - -# Configuration -buildah config --entrypoint '["mvn","clean","install"]' $container - -buildah commit --rm --format docker $container argeo/argeo2-builder:maven-v$VERSION_MAVEN-$ARCH -buildah tag argeo/argeo2-builder:maven-v$VERSION_MAVEN-$ARCH argeo/argeo2-builder:$ARCH - -buildah push argeo/argeo2-builder:maven-v$VERSION_MAVEN-$ARCH docker://argeo/argeo2-builder:maven-v$VERSION_MAVEN-$ARCH -buildah push argeo/argeo2-builder:$ARCH docker://argeo/argeo2-builder:$ARCH diff --git a/dist/containers/argeo2-java b/dist/containers/argeo2-java deleted file mode 100755 index 170872f36..000000000 --- a/dist/containers/argeo2-java +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -source "$(dirname "$0")/buildah-metadata" -buildah pull ubi8/ubi-minimal -container=$(buildah from ubi8/ubi-minimal) - -source "$(dirname "$0")/buildah-common" - -buildah config --label release="1" $container -buildah config --label version="$VERSION_JAVA" $container - -# Metadata -buildah config --label name="argeo2-java" $container -buildah config --label description="OpenJDK 11 headless on Red Hat UBI 8" $container -buildah config --label url=https://hub.docker.com/repository/docker/argeo/argeo2-java $container - -# 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 argeo/argeo2-java:openjdk-v$VERSION_JAVA-$ARCH -buildah tag argeo/argeo2-java:openjdk-v$VERSION_JAVA-$ARCH argeo/argeo2-java:$ARCH - -buildah push argeo/argeo2-java:openjdk-v$VERSION_JAVA-$ARCH docker://argeo/argeo2-java:openjdk-v$VERSION_JAVA-$ARCH -buildah push argeo/argeo2-java:$ARCH docker://argeo/argeo2-java:$ARCH diff --git a/dist/containers/argeo2-lists b/dist/containers/argeo2-lists deleted file mode 100755 index 1c2981023..000000000 --- a/dist/containers/argeo2-lists +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -# Multi-architecture manifests -buildah rmi argeo/argeo2-java:latest -buildah manifest create argeo/argeo2-java:latest docker://argeo/argeo2-java:x86_64 docker://argeo/argeo2-java:aarch64 -buildah manifest push argeo/argeo2-java:latest docker://argeo/argeo2-java:latest - -buildah rmi argeo/argeo2-tp:latest -buildah manifest create argeo/argeo2-tp:latest docker://argeo/argeo2-tp:x86_64 docker://argeo/argeo2-tp:aarch64 -buildah manifest push argeo/argeo2-tp:latest docker://argeo/argeo2-tp:latest - -buildah rmi argeo/argeo2-node:latest -buildah manifest create argeo/argeo2-node:latest docker://argeo/argeo2-node:x86_64 docker://argeo/argeo2-node:aarch64 -buildah manifest push argeo/argeo2-node:latest docker://argeo/argeo2-node:latest - -buildah rmi argeo/argeo2-builder:latest -buildah manifest create argeo/argeo2-builder:latest docker://argeo/argeo2-builder:x86_64 docker://argeo/argeo2-builder:aarch64 -buildah manifest push argeo/argeo2-builder:latest docker://argeo/argeo2-builder:latest - diff --git a/dist/containers/argeo2-node b/dist/containers/argeo2-node deleted file mode 100755 index 8578ab94a..000000000 --- a/dist/containers/argeo2-node +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh - -source "$(dirname "$0")/buildah-metadata" -container=$(buildah from argeo/argeo2-tp:$VERSION_ARGEO_TP-$ARCH) - -# Override version -#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_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 - -# 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 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 diff --git a/dist/containers/argeo2-node-snapshots b/dist/containers/argeo2-node-snapshots deleted file mode 100755 index 54422b4a5..000000000 --- a/dist/containers/argeo2-node-snapshots +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh - -source "$(dirname "$0")/buildah-metadata" -container=$(buildah from argeo/argeo2-tp:$VERSION_ARGEO_TP-$ARCH) - -# Override version -buildah copy $container argeo2-snapshots.repo /etc/yum.repos.d/ - -source "$(dirname "$0")/buildah-common" - -#buildah config --label release="1" $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 - -# Argeo Node -buildah run $container -- microdnf install osgi-boot argeo-cms-e4-rap argeo-node -buildah run $container -- microdnf clean all - -# Override settings -buildah copy $container dev-settings.sh /etc/argeo/settings.sh - -# Configuration -buildah config --entrypoint '["/usr/sbin/argeoctl","start"]' $container -buildah config --port 8080 $container - -buildah commit --rm --format docker $container argeo/argeo2-node:snapshots-$ARCH - -buildah push argeo/argeo2-node:snapshots-$ARCH docker://argeo/argeo2-node:snapshots-$ARCH diff --git a/dist/containers/argeo2-rpmfactory.repo b/dist/containers/argeo2-rpmfactory.repo deleted file mode 100644 index 00445b6ab..000000000 --- a/dist/containers/argeo2-rpmfactory.repo +++ /dev/null @@ -1,4 +0,0 @@ -[argeo2-rpmfactory] -baseurl=file:///srv/rpmfactory/argeo-osgi-2/el7/ -gpgcheck=0 -enabled=1 diff --git a/dist/containers/argeo2-snapshots.repo b/dist/containers/argeo2-snapshots.repo deleted file mode 100644 index 39ccba545..000000000 --- a/dist/containers/argeo2-snapshots.repo +++ /dev/null @@ -1,4 +0,0 @@ -[argeo-osgi-staging] -name=Argeo 2 OSGi (staging) -baseurl=http://snapshots.argeo.org/rpm/testing/argeo-osgi-2/el7/ -gpgcheck=no diff --git a/dist/containers/argeo2-tp b/dist/containers/argeo2-tp deleted file mode 100755 index a033ab00e..000000000 --- a/dist/containers/argeo2-tp +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh - -source "$(dirname "$0")/buildah-metadata" -container=$(buildah from argeo/argeo2-java:$ARCH) - -source "$(dirname "$0")/buildah-common" - -buildah config --label release="1" $container -buildah config --label version="$VERSION_ARGEO_TP" $container - -# Metadata -buildah config --label name="argeo2-tp" $container -buildah config --label description="Argeo 2 OSGi Third Parties" $container -buildah config --label url=https://hub.docker.com/repository/docker/argeo/argeo2-tp $container - -# 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 -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 argeo/argeo2-tp:$VERSION_ARGEO_TP-$ARCH -buildah tag argeo/argeo2-tp:$VERSION_ARGEO_TP-$ARCH argeo/argeo2-tp:$ARCH - -buildah push argeo/argeo2-tp:$VERSION_ARGEO_TP-$ARCH docker://argeo/argeo2-tp:$VERSION_ARGEO_TP-$ARCH -buildah push argeo/argeo2-tp:$ARCH docker://argeo/argeo2-tp:$ARCH diff --git a/dist/containers/buildah-common b/dist/containers/buildah-common deleted file mode 100755 index c91203254..000000000 --- a/dist/containers/buildah-common +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -# Metadata -buildah config --label maintainer="Mathieu Baudier, mbaudier at argeo.org" $container -buildah config --created-by "Mathieu Baudier, mbaudier at argeo.org" $container -buildah config --author "Argeo GmbH, http://www.argeo.org, contact at argeo.org" $container -buildah config --label vendor="Argeo GmbH" $container - -# Remove Red Hat labels -buildah config --label authoritative-source-url= $container -buildah config --label com.redhat.build-host= $container -buildah config --label com.redhat.component= $container -buildah config --label com.redhat.license_terms= $container -buildah config --label io.k8s.description= $container -buildah config --label io.k8s.display-name= $container -buildah config --label io.openshift.expose-services= $container -buildah config --label io.openshift.tags= $container -buildah config --label vcs-ref= $container -buildah config --label vcs-type= $container -buildah config --label summary= $container - diff --git a/dist/containers/buildah-login b/dist/containers/buildah-login deleted file mode 100755 index 171a869af..000000000 --- a/dist/containers/buildah-login +++ /dev/null @@ -1,8 +0,0 @@ -#!/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 deleted file mode 100644 index 3908bb4bb..000000000 --- a/dist/containers/buildah-metadata +++ /dev/null @@ -1,8 +0,0 @@ -VERSION_ARGEO_COMMONS=2.1 -VERSION_ARGEO_TP=2.1 - -VERSION_MAVEN=3.5 -VERSION_JAVA=11 - -ARCH=`arch` -echo Building for architecture $ARCH diff --git a/dist/containers/dev-settings.sh b/dist/containers/dev-settings.sh deleted file mode 100644 index 298393408..000000000 --- a/dist/containers/dev-settings.sh +++ /dev/null @@ -1,2 +0,0 @@ -export LANG=en_US.utf8 -JAVA_OPTS="-ea -agentlib:jdwp=transport=dt_socket,server=y,address=*:8000,suspend=n -showversion -Xmx512m -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=7084 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false" diff --git a/dist/containers/filtered/buildah-metadata b/dist/containers/filtered/buildah-metadata deleted file mode 100644 index d0e046667..000000000 --- a/dist/containers/filtered/buildah-metadata +++ /dev/null @@ -1,8 +0,0 @@ -#VERSION_ARGEO_COMMONS=2.1.84 -#VERSION_ARGEO_TP=${version.argeo-tp} - -#VERSION_MAVEN=3.5.4 -#VERSION_JAVA=11.0.5 - -#ARCH=`arch` -#echo Building for architecture $ARCH diff --git a/dist/containers/maven.conf b/dist/containers/maven.conf deleted file mode 100644 index e96cfc765..000000000 --- a/dist/containers/maven.conf +++ /dev/null @@ -1 +0,0 @@ -JAVA_HOME=/usr/lib/jvm/java-11-openjdk diff --git a/dist/containers/pom.xml b/dist/containers/pom.xml deleted file mode 100644 index 2c7f6bfcc..000000000 --- a/dist/containers/pom.xml +++ /dev/null @@ -1,37 +0,0 @@ - - 4.0.0 - - org.argeo.commons - 2.3-SNAPSHOT - dist - .. - - containers - pom - Argeo OCI Containers - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dist/pom.xml b/dist/pom.xml index 7e0e20820..5ed36895c 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -14,7 +14,6 @@ osgi-boot argeo-node - containers -- 2.30.2