From 0f78740c69307e3b9c5e5f9b8f36912c2215751c Mon Sep 17 00:00:00 2001 From: Eric Timmons <etimmons@mit.edu> Date: Wed, 14 Oct 2020 18:53:59 -0400 Subject: [PATCH] Build images with openjdk:8 Will switch to 11 after 1.7.2 is out. --- images/debian/buster/amd64/Dockerfile | 4 +- images/debian/buster/arm64/Dockerfile | 40 ------------------- images/debian/buster/arm64/docker-entrypoint | 9 ----- manifest-templates/debian-buster.yaml | 4 -- manifest-templates/debian.yaml | 4 -- manifest-templates/latest.yaml | 4 -- .../versioned-debian-buster.yaml | 4 -- manifest-templates/versioned-debian.yaml | 4 -- manifest-templates/versioned.yaml | 4 -- 9 files changed, 2 insertions(+), 75 deletions(-) delete mode 100644 images/debian/buster/arm64/Dockerfile delete mode 100755 images/debian/buster/arm64/docker-entrypoint diff --git a/images/debian/buster/amd64/Dockerfile b/images/debian/buster/amd64/Dockerfile index 248893a..03ba945 100644 --- a/images/debian/buster/amd64/Dockerfile +++ b/images/debian/buster/amd64/Dockerfile @@ -1,4 +1,4 @@ -FROM openjdk:11-buster +FROM openjdk:8-buster LABEL maintainer="etimmons@mit.edu" @@ -24,7 +24,7 @@ RUN set -x \ && gpg --batch --verify "abcl-src-${ABCL_VERSION}.tar.gz.asc" "abcl-src-${ABCL_VERSION}.tar.gz" \ && gunzip "abcl-src-${ABCL_VERSION}.tar.gz" \ && tar xf "abcl-src-${ABCL_VERSION}.tar" \ - && ( cd "abcl-src-${ABCL_VERSION}" && bash ./ci/create-abcl-properties.bash openjdk11 && ant abcl ) \ + && ( cd "abcl-src-${ABCL_VERSION}" && bash ./ci/create-abcl-properties.bash openjdk8 && ant abcl ) \ && ln -s "/usr/local/src/abcl-src-$ABCL_VERSION/abcl" /usr/local/bin/abcl \ && rm -rf "abcl-src-${ABCL_VERSION}.tar.gz.asc" "abcl-src-${ABCL_VERSION}.tar" "$GNUPGHOME" \ && apt-get remove -y curl ca-certificates gnupg dirmngr ant \ diff --git a/images/debian/buster/arm64/Dockerfile b/images/debian/buster/arm64/Dockerfile deleted file mode 100644 index 248893a..0000000 --- a/images/debian/buster/arm64/Dockerfile +++ /dev/null @@ -1,40 +0,0 @@ -FROM openjdk:11-buster - -LABEL maintainer="etimmons@mit.edu" - -ENV ABCL_VERSION=1.7.0 - -WORKDIR /usr/local/src/ - -ARG ABCL_SIGNING_KEY=5491D207FF9ECDE0BEA277772A9641104DB1773D - -# hadolint ignore=DL3003,DL3008 -RUN set -x \ - && apt-get update \ - && apt-get install -y --no-install-recommends curl ca-certificates gnupg dirmngr ant \ - && curl -L https://abcl.org/releases/${ABCL_VERSION}/abcl-src-${ABCL_VERSION}.tar.gz > abcl-src-${ABCL_VERSION}.tar.gz \ - && curl -L https://abcl.org/releases/${ABCL_VERSION}/abcl-src-${ABCL_VERSION}.tar.gz.asc > abcl-src-${ABCL_VERSION}.tar.gz.asc \ - && GNUPGHOME="$(mktemp -d)" \ - && export GNUPGHOME \ - && (gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys ${ABCL_SIGNING_KEY} \ - || gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys ${ABCL_SIGNING_KEY} \ - || gpg --batch --keyserver keyserver.ubuntu.com --recv-keys ${ABCL_SIGNING_KEY} \ - || gpg --batch --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys ${ABCL_SIGNING_KEY} \ - || gpg --batch --keyserver pgp.mit.edu --recv-keys ${ABCL_SIGNING_KEY}) \ - && gpg --batch --verify "abcl-src-${ABCL_VERSION}.tar.gz.asc" "abcl-src-${ABCL_VERSION}.tar.gz" \ - && gunzip "abcl-src-${ABCL_VERSION}.tar.gz" \ - && tar xf "abcl-src-${ABCL_VERSION}.tar" \ - && ( cd "abcl-src-${ABCL_VERSION}" && bash ./ci/create-abcl-properties.bash openjdk11 && ant abcl ) \ - && ln -s "/usr/local/src/abcl-src-$ABCL_VERSION/abcl" /usr/local/bin/abcl \ - && rm -rf "abcl-src-${ABCL_VERSION}.tar.gz.asc" "abcl-src-${ABCL_VERSION}.tar" "$GNUPGHOME" \ - && apt-get remove -y curl ca-certificates gnupg dirmngr ant \ - && apt-get autoremove -y \ - && rm -rf /var/lib/apt/lists/* - -WORKDIR / - -COPY docker-entrypoint /usr/local/bin/docker-entrypoint - -ENTRYPOINT ["docker-entrypoint"] - -CMD ["abcl"] diff --git a/images/debian/buster/arm64/docker-entrypoint b/images/debian/buster/arm64/docker-entrypoint deleted file mode 100755 index 1c80034..0000000 --- a/images/debian/buster/arm64/docker-entrypoint +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -# If the first arg starts with a hyphen, prepend abcl to -# arguments. -if [ "${1#-}" != "$1" ]; then - set -- abcl "$@" -fi - -exec "$@" diff --git a/manifest-templates/debian-buster.yaml b/manifest-templates/debian-buster.yaml index 22ab159..5de0bc2 100644 --- a/manifest-templates/debian-buster.yaml +++ b/manifest-templates/debian-buster.yaml @@ -4,7 +4,3 @@ manifests: platform: architecture: amd64 os: linux - - image: $DEBIAN_BUSTER_ARM64_NONBUILD_DIGEST - platform: - architecture: arm64 - os: linux diff --git a/manifest-templates/debian.yaml b/manifest-templates/debian.yaml index 38438a6..235b854 100644 --- a/manifest-templates/debian.yaml +++ b/manifest-templates/debian.yaml @@ -4,7 +4,3 @@ manifests: platform: architecture: amd64 os: linux - - image: $DEBIAN_BUSTER_ARM64_NONBUILD_DIGEST - platform: - architecture: arm64 - os: linux diff --git a/manifest-templates/latest.yaml b/manifest-templates/latest.yaml index 641ad8b..e855b30 100644 --- a/manifest-templates/latest.yaml +++ b/manifest-templates/latest.yaml @@ -4,7 +4,3 @@ manifests: platform: architecture: amd64 os: linux - - image: $DEBIAN_BUSTER_ARM64_NONBUILD_DIGEST - platform: - architecture: arm64 - os: linux diff --git a/manifest-templates/versioned-debian-buster.yaml b/manifest-templates/versioned-debian-buster.yaml index d7a5a42..bf1c276 100644 --- a/manifest-templates/versioned-debian-buster.yaml +++ b/manifest-templates/versioned-debian-buster.yaml @@ -4,7 +4,3 @@ manifests: platform: architecture: amd64 os: linux - - image: $DEBIAN_BUSTER_ARM64_NONBUILD_DIGEST - platform: - architecture: arm64 - os: linux diff --git a/manifest-templates/versioned-debian.yaml b/manifest-templates/versioned-debian.yaml index f2f265a..085c6e0 100644 --- a/manifest-templates/versioned-debian.yaml +++ b/manifest-templates/versioned-debian.yaml @@ -4,7 +4,3 @@ manifests: platform: architecture: amd64 os: linux - - image: $DEBIAN_BUSTER_ARM64_NONBUILD_DIGEST - platform: - architecture: arm64 - os: linux diff --git a/manifest-templates/versioned.yaml b/manifest-templates/versioned.yaml index e182f8b..0f2d704 100644 --- a/manifest-templates/versioned.yaml +++ b/manifest-templates/versioned.yaml @@ -4,7 +4,3 @@ manifests: platform: architecture: amd64 os: linux - - image: $DEBIAN_BUSTER_ARM64_NONBUILD_DIGEST - platform: - architecture: arm64 - os: linux -- GitLab