From 4f7a7371e758c4ea00af22998a99b0d628aa070a Mon Sep 17 00:00:00 2001 From: Matthias Andreas Benkard Date: Sat, 14 May 2022 21:19:55 +0200 Subject: =?UTF-8?q?Remove=20runtime=20container=20image=20recipe=20(moved?= =?UTF-8?q?=20to=20=E2=80=9Ccontainer-images=E2=80=9D=20repository).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I35f3c0252b1002afd50e7f4bf9509fe2f5f3992b --- src/main/docker/runtime/.gitignore | 6 ------ src/main/docker/runtime/Dockerfile | 30 ------------------------------ src/main/docker/runtime/build | 36 ------------------------------------ src/main/docker/runtime/prepare | 16 ---------------- 4 files changed, 88 deletions(-) delete mode 100644 src/main/docker/runtime/.gitignore delete mode 100644 src/main/docker/runtime/Dockerfile delete mode 100755 src/main/docker/runtime/build delete mode 100755 src/main/docker/runtime/prepare diff --git a/src/main/docker/runtime/.gitignore b/src/main/docker/runtime/.gitignore deleted file mode 100644 index 3ed2fbd..0000000 --- a/src/main/docker/runtime/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -# SPDX-FileCopyrightText: © 2022 Matthias Andreas Benkard -# -# SPDX-License-Identifier: GPL-3.0-or-later - -/cache -/jdk-dist diff --git a/src/main/docker/runtime/Dockerfile b/src/main/docker/runtime/Dockerfile deleted file mode 100644 index ad41771..0000000 --- a/src/main/docker/runtime/Dockerfile +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-FileCopyrightText: © 2022 Matthias Andreas Benkard -# -# SPDX-License-Identifier: GPL-3.0-or-later - -FROM registry.access.redhat.com/ubi8/ubi-minimal:latest AS ubi-minimal - -# Add OpenJDK (complete). -ADD jdk-dist/latest.tar.gz /jdk - -# JLink a trimmed JDK. -RUN microdnf --assumeyes --nodocs install binutils -RUN /jdk/*/bin/jlink \ - -J-XX:MaxRAMPercentage=75 \ - --add-modules java.base,java.instrument,java.naming,java.rmi,java.scripting,java.security.jgss,java.security.sasl,java.sql,jdk.compiler,jdk.jconsole,jdk.unsupported \ - --compress=1 \ - --no-man-pages \ - --strip-debug \ - --output /java -RUN /java/bin/java -Xshare:dump - -# Set mtimes to @0 for reproducibility. -RUN microdnf --assumeyes --nodocs install findutils -RUN find /java -exec touch --date=@0 '{}' ';' - -# Build the final image. -FROM registry.access.redhat.com/ubi8/ubi-micro:latest -COPY --from=ubi-minimal /lib64/libz.so.1 /lib64/ -COPY --from=ubi-minimal /java /java -ENV JAVA_HOME=/java -ENV PATH=/java/bin:$PATH diff --git a/src/main/docker/runtime/build b/src/main/docker/runtime/build deleted file mode 100755 index 01347d7..0000000 --- a/src/main/docker/runtime/build +++ /dev/null @@ -1,36 +0,0 @@ -#! /bin/sh -# SPDX-FileCopyrightText: © 2022 Matthias Andreas Benkard -# -# SPDX-License-Identifier: GPL-3.0-or-later - -set -euo pipefail - -cd "$(dirname $(readlink -e "$0"))" - -image=docker.benkard.de/mulk/openjdk-runtime:latest -use_kaniko=no - -./prepare - -if [[ "${use_kaniko}" == yes ]]; then - docker run \ - --mount type=bind,src="$PWD",target=/workspace \ - gcr.io/kaniko-project/warmer:latest \ - --cache-dir=/workspace/cache \ - --image=registry.access.redhat.com/ubi8/ubi-micro:latest \ - --image=registry.access.redhat.com/ubi8/ubi-minimal:latest - - docker run \ - --mount type=bind,src="$PWD",target=/workspace \ - --mount type=bind,src="$HOME/.docker",target=/root/.docker,ro=true \ - gcr.io/kaniko-project/executor:latest \ - --dockerfile Dockerfile \ - --destination "${image}" \ - --context dir:///workspace/ \ - --cache=true \ - --cache-ttl=16800h0m0s \ - --reproducible=true -else - docker build -t "${image}" . - docker push "${image}" -fi diff --git a/src/main/docker/runtime/prepare b/src/main/docker/runtime/prepare deleted file mode 100755 index f0fddba..0000000 --- a/src/main/docker/runtime/prepare +++ /dev/null @@ -1,16 +0,0 @@ -#! /bin/sh -# SPDX-FileCopyrightText: © 2022 Matthias Andreas Benkard -# -# SPDX-License-Identifier: GPL-3.0-or-later - -set -euo pipefail - -cd "$(dirname $(readlink -e "$0"))" - -openjdk_package_info=$(curl "https://api.foojay.io/disco/v2.0/packages?package_type=jdk&latest=per_distro&directly_downloadable=true&release_status=ga&javafx_bundled=false&operating_system=linux&architecture=x64&archive_type=tar.gz&distro=oracle_open_jdk") - -openjdk_package_uri=$(jq -r '.result[0].links.pkg_download_redirect' <<<"${openjdk_package_info}") -openjdk_package_filename=$(jq -r '.result[0].filename' <<<"${openjdk_package_info}") -curl --fail --create-dirs -C - -o "jdk-dist/${openjdk_package_filename}" "${openjdk_package_uri}" - -ln -svf "${openjdk_package_filename}" "jdk-dist/latest.tar.gz" -- cgit v1.2.3