diff --git a/nightly/buster/jdk-11/Dockerfile b/nightly/buster/jdk-11/Dockerfile deleted file mode 100644 index ecef88582300e83e7d3ba41c9b1806c5635eb487..0000000000000000000000000000000000000000 --- a/nightly/buster/jdk-11/Dockerfile +++ /dev/null @@ -1,139 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# -FROM openjdk:11-jdk-buster - -# Install the packages that buildpack-deps adds on top of -# buildpack-deps:scm. This is a bit odd for a JVM based image, but the CFFI -# project is commonly used and requires a compiler, headers, etc. Additionally, -# this gives a more uniform experience between the different cl-docker-images -# project's images. -RUN set -ex; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - autoconf \ - automake \ - bzip2 \ - default-libmysqlclient-dev \ - dpkg-dev \ - file \ - g++ \ - gcc \ - imagemagick \ - libbz2-dev \ - libc6-dev \ - libcurl4-openssl-dev \ - libdb-dev \ - libevent-dev \ - libffi-dev \ - libgdbm-dev \ - libglib2.0-dev \ - libgmp-dev \ - libjpeg-dev \ - libkrb5-dev \ - liblzma-dev \ - libmagickcore-dev \ - libmagickwand-dev \ - libmaxminddb-dev \ - libncurses5-dev \ - libncursesw5-dev \ - libpng-dev \ - libpq-dev \ - libreadline-dev \ - libsqlite3-dev \ - libssl-dev \ - libtool \ - libwebp-dev \ - libxml2-dev \ - libxslt-dev \ - libyaml-dev \ - make \ - patch \ - unzip \ - xz-utils \ - zlib1g-dev \ - \ - ; \ - rm -rf /var/lib/apt/lists/* - -# Install Maven as it is commonly used with ABCL, including with anything that -# uses CFFI. We install it ourselves instead of basing the image off of maven -# because the maven image only follows openjdk's default OS choice and does not -# provide buster based images for jdk12+. - -ARG MAVEN_VERSION=3.6.3 -ARG MAVEN_SHA=c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0 - -WORKDIR /usr/share/maven - -RUN curl -fsSL https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz > /tmp/apache-maven.tar.gz \ - && echo "${MAVEN_SHA} /tmp/apache-maven.tar.gz" | sha512sum -c - \ - && tar -xzf /tmp/apache-maven.tar.gz --strip-components=1 \ - && rm -f /tmp/apache-maven.tar.gz \ - && ln -s /usr/share/maven/bin/mvn /usr/bin/mvn - -ENV MAVEN_HOME /usr/share/maven - -# Now install ABCL - -ENV ABCL_COMMIT fe57bca48b47bf053f2c3751fe5c8837da4a513e - -WORKDIR /usr/local/src/ - -RUN set -x \ - # Install ant - && ANT_VERSION="1.10.9" \ - && curl -fsSL "https://mirrors.gigenet.com/apache/ant/binaries/apache-ant-$ANT_VERSION-bin.tar.gz" > "ant-$ANT_VERSION.tar.gz" \ - && tar xf "ant-$ANT_VERSION.tar.gz" \ - && PATH="/usr/local/src/apache-ant-$ANT_VERSION/bin:$PATH" \ - && ANT_HOME="/usr/local/src/apache-ant-$ANT_VERSION" \ - && export ANT_HOME \ - # Install ABCL - && curl -fsSL "https://github.com/armedbear/abcl/archive/$ABCL_COMMIT.tar.gz" > "abcl-$ABCL_COMMIT.tar.gz" \ - && tar xf "abcl-$ABCL_COMMIT.tar.gz" \ - && JAVA_MAJOR_VERSION="${JAVA_VERSION%%.*}" \ - && JAVA_MAJOR_VERSION="${JAVA_MAJOR_VERSION%%u*}" \ - && export JAVA_MAJOR_VERSION \ - && mkdir /usr/local/share/abcl/ \ - && mv "abcl-$ABCL_COMMIT" abcl \ - && (cd "abcl" && bash ./ci/create-abcl-properties.bash "openjdk$JAVA_MAJOR_VERSION" && ant && cp dist/* /usr/local/share/abcl && ant clean ) \ - && rm -rf "abcl-$ABCL_COMMIT.tar.gz" ant* apache-ant* \ - && java -jar /usr/local/share/abcl/abcl.jar --eval '(print (multiple-value-list (lisp-implementation-version)))' --eval '(quit)' - -# Add the Quicklisp installer. -WORKDIR /usr/local/share/common-lisp/source/quicklisp/ - -ENV QUICKLISP_SIGNING_KEY D7A3489DDEFE32B7D0E7CC61307965AB028B5FF7 - -RUN set -x \ - && curl -fsSL "https://beta.quicklisp.org/quicklisp.lisp" > quicklisp.lisp \ - && curl -fsSL "https://beta.quicklisp.org/quicklisp.lisp.asc" > quicklisp.lisp.asc \ - && GNUPGHOME="$(mktemp -d)" \ - && export GNUPGHOME \ - && gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "${QUICKLISP_SIGNING_KEY}" \ - && gpg --batch --verify "quicklisp.lisp.asc" "quicklisp.lisp" \ - && rm quicklisp.lisp.asc \ - && rm -rf "$GNUPGHOME" - -# Add the script to trivially install Quicklisp -COPY install-quicklisp /usr/local/bin/install-quicklisp - -# Install cl-launch. In the next release, move this up so that all images can -# share it. -# hadolint ignore=DL3008 -RUN set -x \ - && apt-get update \ - && apt-get install --no-install-recommends -y cl-launch \ - && rm -rf /var/lib/apt/lists/* - -# Add the entrypoint -WORKDIR / - -COPY abcl-wrapper /usr/local/bin/abcl -COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh - -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD ["abcl"] diff --git a/nightly/buster/jdk-11/abcl-wrapper b/nightly/buster/jdk-11/abcl-wrapper deleted file mode 100755 index da76f04365f54d85863e4bd70e3f934c3c21c6d0..0000000000000000000000000000000000000000 --- a/nightly/buster/jdk-11/abcl-wrapper +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -exec java -cp "/usr/local/share/abcl/abcl.jar:$CLASSPATH" \ - -XshowSettings:vm -Dfile.encoding=UTF-8 \ - -XX:CompileThreshold=10 \ - org.armedbear.lisp.Main \ - "$@" diff --git a/nightly/buster/jdk-11/docker-entrypoint.sh b/nightly/buster/jdk-11/docker-entrypoint.sh deleted file mode 100755 index 7f6b5a34d7349c9fbeb8f116018e075bb257005d..0000000000000000000000000000000000000000 --- a/nightly/buster/jdk-11/docker-entrypoint.sh +++ /dev/null @@ -1,8 +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/nightly/buster/jdk-11/install-quicklisp b/nightly/buster/jdk-11/install-quicklisp deleted file mode 100755 index ae80aa54dd8c444805e3b99ebe3251f4ae4429f0..0000000000000000000000000000000000000000 --- a/nightly/buster/jdk-11/install-quicklisp +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh - -if [ -z "$QUICKLISP_DIST_VERSION" ] || [ "$QUICKLISP_DIST_VERSION" = "latest" ]; then - QUICKLISP_DIST_VERSION=nil -else - QUICKLISP_DIST_VERSION="\"quicklisp/$QUICKLISP_DIST_VERSION\"" -fi - -if [ -z "$QUICKLISP_CLIENT_VERSION" ] || [ "$QUICKLISP_CLIENT_VERSION" = "latest" ]; then - QUICKLISP_CLIENT_VERSION=nil -else - QUICKLISP_CLIENT_VERSION="\"$QUICKLISP_CLIENT_VERSION\"" -fi - -abcl --batch \ - --load /usr/local/share/common-lisp/source/quicklisp/quicklisp.lisp \ - --eval "(quicklisp-quickstart:install :dist-version $QUICKLISP_DIST_VERSION :client-version $QUICKLISP_CLIENT_VERSION)" \ - --eval "(when (equalp \"$QUICKLISP_ADD_TO_INIT_FILE\" \"true\") (ql-util:without-prompting (ql:add-to-init-file)))" diff --git a/nightly/buster/jdk-11/slim/Dockerfile b/nightly/buster/jdk-11/slim/Dockerfile deleted file mode 100644 index e538201a4cd2d48bfa7d8b55f66529f9f7215987..0000000000000000000000000000000000000000 --- a/nightly/buster/jdk-11/slim/Dockerfile +++ /dev/null @@ -1,46 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# -FROM openjdk:11-jdk-slim-buster - -ENV ABCL_COMMIT fe57bca48b47bf053f2c3751fe5c8837da4a513e - -WORKDIR /usr/local/src/ - -RUN set -x \ - # Install fetch deps - && apt-get update \ - && apt-get install --no-install-recommends -y curl gnupg dirmngr \ - # Install ant - && ANT_VERSION="1.10.9" \ - && curl -fsSL "https://mirrors.gigenet.com/apache/ant/binaries/apache-ant-$ANT_VERSION-bin.tar.gz" > "ant-$ANT_VERSION.tar.gz" \ - && tar xf "ant-$ANT_VERSION.tar.gz" \ - && PATH="/usr/local/src/apache-ant-$ANT_VERSION/bin:$PATH" \ - && ANT_HOME="/usr/local/src/apache-ant-$ANT_VERSION" \ - && export ANT_HOME \ - # Install ABCL - && curl -fsSL "https://github.com/armedbear/abcl/archive/$ABCL_COMMIT.tar.gz" > "abcl-$ABCL_COMMIT.tar.gz" \ - && tar xf "abcl-$ABCL_COMMIT.tar.gz" \ - && JAVA_MAJOR_VERSION="${JAVA_VERSION%%.*}" \ - && JAVA_MAJOR_VERSION="${JAVA_MAJOR_VERSION%%u*}" \ - && export JAVA_MAJOR_VERSION \ - && mkdir /usr/local/share/abcl/ \ - && (cd "abcl-$ABCL_COMMIT" && bash ./ci/create-abcl-properties.bash "openjdk$JAVA_MAJOR_VERSION" && ant && cp dist/* /usr/local/share/abcl ) \ - && rm -rf abcl* ant* apache-ant* \ - # Remove fetch deps - && apt-get remove -y curl gnupg dirmngr \ - && apt-get autoremove -y \ - && rm -rf /var/lib/apt/lists/* \ - # Smoke test ABCL. - && java -jar /usr/local/share/abcl/abcl.jar --batch --eval '(print (multiple-value-list (lisp-implementation-version)))' - -WORKDIR / - -COPY abcl-wrapper /usr/local/bin/abcl -COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh - -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD ["abcl"] diff --git a/nightly/buster/jdk-11/slim/abcl-wrapper b/nightly/buster/jdk-11/slim/abcl-wrapper deleted file mode 100755 index da76f04365f54d85863e4bd70e3f934c3c21c6d0..0000000000000000000000000000000000000000 --- a/nightly/buster/jdk-11/slim/abcl-wrapper +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -exec java -cp "/usr/local/share/abcl/abcl.jar:$CLASSPATH" \ - -XshowSettings:vm -Dfile.encoding=UTF-8 \ - -XX:CompileThreshold=10 \ - org.armedbear.lisp.Main \ - "$@" diff --git a/nightly/buster/jdk-11/slim/docker-entrypoint.sh b/nightly/buster/jdk-11/slim/docker-entrypoint.sh deleted file mode 100755 index 7f6b5a34d7349c9fbeb8f116018e075bb257005d..0000000000000000000000000000000000000000 --- a/nightly/buster/jdk-11/slim/docker-entrypoint.sh +++ /dev/null @@ -1,8 +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/nightly/buster/jdk-15/Dockerfile b/nightly/buster/jdk-15/Dockerfile deleted file mode 100644 index b219d3823840325aff90aca10d8f251e352f924d..0000000000000000000000000000000000000000 --- a/nightly/buster/jdk-15/Dockerfile +++ /dev/null @@ -1,139 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# -FROM openjdk:15-jdk-buster - -# Install the packages that buildpack-deps adds on top of -# buildpack-deps:scm. This is a bit odd for a JVM based image, but the CFFI -# project is commonly used and requires a compiler, headers, etc. Additionally, -# this gives a more uniform experience between the different cl-docker-images -# project's images. -RUN set -ex; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - autoconf \ - automake \ - bzip2 \ - default-libmysqlclient-dev \ - dpkg-dev \ - file \ - g++ \ - gcc \ - imagemagick \ - libbz2-dev \ - libc6-dev \ - libcurl4-openssl-dev \ - libdb-dev \ - libevent-dev \ - libffi-dev \ - libgdbm-dev \ - libglib2.0-dev \ - libgmp-dev \ - libjpeg-dev \ - libkrb5-dev \ - liblzma-dev \ - libmagickcore-dev \ - libmagickwand-dev \ - libmaxminddb-dev \ - libncurses5-dev \ - libncursesw5-dev \ - libpng-dev \ - libpq-dev \ - libreadline-dev \ - libsqlite3-dev \ - libssl-dev \ - libtool \ - libwebp-dev \ - libxml2-dev \ - libxslt-dev \ - libyaml-dev \ - make \ - patch \ - unzip \ - xz-utils \ - zlib1g-dev \ - \ - ; \ - rm -rf /var/lib/apt/lists/* - -# Install Maven as it is commonly used with ABCL, including with anything that -# uses CFFI. We install it ourselves instead of basing the image off of maven -# because the maven image only follows openjdk's default OS choice and does not -# provide buster based images for jdk12+. - -ARG MAVEN_VERSION=3.6.3 -ARG MAVEN_SHA=c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0 - -WORKDIR /usr/share/maven - -RUN curl -fsSL https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz > /tmp/apache-maven.tar.gz \ - && echo "${MAVEN_SHA} /tmp/apache-maven.tar.gz" | sha512sum -c - \ - && tar -xzf /tmp/apache-maven.tar.gz --strip-components=1 \ - && rm -f /tmp/apache-maven.tar.gz \ - && ln -s /usr/share/maven/bin/mvn /usr/bin/mvn - -ENV MAVEN_HOME /usr/share/maven - -# Now install ABCL - -ENV ABCL_COMMIT fe57bca48b47bf053f2c3751fe5c8837da4a513e - -WORKDIR /usr/local/src/ - -RUN set -x \ - # Install ant - && ANT_VERSION="1.10.9" \ - && curl -fsSL "https://mirrors.gigenet.com/apache/ant/binaries/apache-ant-$ANT_VERSION-bin.tar.gz" > "ant-$ANT_VERSION.tar.gz" \ - && tar xf "ant-$ANT_VERSION.tar.gz" \ - && PATH="/usr/local/src/apache-ant-$ANT_VERSION/bin:$PATH" \ - && ANT_HOME="/usr/local/src/apache-ant-$ANT_VERSION" \ - && export ANT_HOME \ - # Install ABCL - && curl -fsSL "https://github.com/armedbear/abcl/archive/$ABCL_COMMIT.tar.gz" > "abcl-$ABCL_COMMIT.tar.gz" \ - && tar xf "abcl-$ABCL_COMMIT.tar.gz" \ - && JAVA_MAJOR_VERSION="${JAVA_VERSION%%.*}" \ - && JAVA_MAJOR_VERSION="${JAVA_MAJOR_VERSION%%u*}" \ - && export JAVA_MAJOR_VERSION \ - && mkdir /usr/local/share/abcl/ \ - && mv "abcl-$ABCL_COMMIT" abcl \ - && (cd "abcl" && bash ./ci/create-abcl-properties.bash "openjdk$JAVA_MAJOR_VERSION" && ant && cp dist/* /usr/local/share/abcl && ant clean ) \ - && rm -rf "abcl-$ABCL_COMMIT.tar.gz" ant* apache-ant* \ - && java -jar /usr/local/share/abcl/abcl.jar --eval '(print (multiple-value-list (lisp-implementation-version)))' --eval '(quit)' - -# Add the Quicklisp installer. -WORKDIR /usr/local/share/common-lisp/source/quicklisp/ - -ENV QUICKLISP_SIGNING_KEY D7A3489DDEFE32B7D0E7CC61307965AB028B5FF7 - -RUN set -x \ - && curl -fsSL "https://beta.quicklisp.org/quicklisp.lisp" > quicklisp.lisp \ - && curl -fsSL "https://beta.quicklisp.org/quicklisp.lisp.asc" > quicklisp.lisp.asc \ - && GNUPGHOME="$(mktemp -d)" \ - && export GNUPGHOME \ - && gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "${QUICKLISP_SIGNING_KEY}" \ - && gpg --batch --verify "quicklisp.lisp.asc" "quicklisp.lisp" \ - && rm quicklisp.lisp.asc \ - && rm -rf "$GNUPGHOME" - -# Add the script to trivially install Quicklisp -COPY install-quicklisp /usr/local/bin/install-quicklisp - -# Install cl-launch. In the next release, move this up so that all images can -# share it. -# hadolint ignore=DL3008 -RUN set -x \ - && apt-get update \ - && apt-get install --no-install-recommends -y cl-launch \ - && rm -rf /var/lib/apt/lists/* - -# Add the entrypoint -WORKDIR / - -COPY abcl-wrapper /usr/local/bin/abcl -COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh - -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD ["abcl"] diff --git a/nightly/buster/jdk-15/abcl-wrapper b/nightly/buster/jdk-15/abcl-wrapper deleted file mode 100755 index da76f04365f54d85863e4bd70e3f934c3c21c6d0..0000000000000000000000000000000000000000 --- a/nightly/buster/jdk-15/abcl-wrapper +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -exec java -cp "/usr/local/share/abcl/abcl.jar:$CLASSPATH" \ - -XshowSettings:vm -Dfile.encoding=UTF-8 \ - -XX:CompileThreshold=10 \ - org.armedbear.lisp.Main \ - "$@" diff --git a/nightly/buster/jdk-15/docker-entrypoint.sh b/nightly/buster/jdk-15/docker-entrypoint.sh deleted file mode 100755 index 7f6b5a34d7349c9fbeb8f116018e075bb257005d..0000000000000000000000000000000000000000 --- a/nightly/buster/jdk-15/docker-entrypoint.sh +++ /dev/null @@ -1,8 +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/nightly/buster/jdk-15/install-quicklisp b/nightly/buster/jdk-15/install-quicklisp deleted file mode 100755 index ae80aa54dd8c444805e3b99ebe3251f4ae4429f0..0000000000000000000000000000000000000000 --- a/nightly/buster/jdk-15/install-quicklisp +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh - -if [ -z "$QUICKLISP_DIST_VERSION" ] || [ "$QUICKLISP_DIST_VERSION" = "latest" ]; then - QUICKLISP_DIST_VERSION=nil -else - QUICKLISP_DIST_VERSION="\"quicklisp/$QUICKLISP_DIST_VERSION\"" -fi - -if [ -z "$QUICKLISP_CLIENT_VERSION" ] || [ "$QUICKLISP_CLIENT_VERSION" = "latest" ]; then - QUICKLISP_CLIENT_VERSION=nil -else - QUICKLISP_CLIENT_VERSION="\"$QUICKLISP_CLIENT_VERSION\"" -fi - -abcl --batch \ - --load /usr/local/share/common-lisp/source/quicklisp/quicklisp.lisp \ - --eval "(quicklisp-quickstart:install :dist-version $QUICKLISP_DIST_VERSION :client-version $QUICKLISP_CLIENT_VERSION)" \ - --eval "(when (equalp \"$QUICKLISP_ADD_TO_INIT_FILE\" \"true\") (ql-util:without-prompting (ql:add-to-init-file)))" diff --git a/nightly/buster/jdk-15/slim/Dockerfile b/nightly/buster/jdk-15/slim/Dockerfile deleted file mode 100644 index 74ab06693c00571540cc152961799c273e7a9f00..0000000000000000000000000000000000000000 --- a/nightly/buster/jdk-15/slim/Dockerfile +++ /dev/null @@ -1,46 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# -FROM openjdk:15-jdk-slim-buster - -ENV ABCL_COMMIT fe57bca48b47bf053f2c3751fe5c8837da4a513e - -WORKDIR /usr/local/src/ - -RUN set -x \ - # Install fetch deps - && apt-get update \ - && apt-get install --no-install-recommends -y curl gnupg dirmngr \ - # Install ant - && ANT_VERSION="1.10.9" \ - && curl -fsSL "https://mirrors.gigenet.com/apache/ant/binaries/apache-ant-$ANT_VERSION-bin.tar.gz" > "ant-$ANT_VERSION.tar.gz" \ - && tar xf "ant-$ANT_VERSION.tar.gz" \ - && PATH="/usr/local/src/apache-ant-$ANT_VERSION/bin:$PATH" \ - && ANT_HOME="/usr/local/src/apache-ant-$ANT_VERSION" \ - && export ANT_HOME \ - # Install ABCL - && curl -fsSL "https://github.com/armedbear/abcl/archive/$ABCL_COMMIT.tar.gz" > "abcl-$ABCL_COMMIT.tar.gz" \ - && tar xf "abcl-$ABCL_COMMIT.tar.gz" \ - && JAVA_MAJOR_VERSION="${JAVA_VERSION%%.*}" \ - && JAVA_MAJOR_VERSION="${JAVA_MAJOR_VERSION%%u*}" \ - && export JAVA_MAJOR_VERSION \ - && mkdir /usr/local/share/abcl/ \ - && (cd "abcl-$ABCL_COMMIT" && bash ./ci/create-abcl-properties.bash "openjdk$JAVA_MAJOR_VERSION" && ant && cp dist/* /usr/local/share/abcl ) \ - && rm -rf abcl* ant* apache-ant* \ - # Remove fetch deps - && apt-get remove -y curl gnupg dirmngr \ - && apt-get autoremove -y \ - && rm -rf /var/lib/apt/lists/* \ - # Smoke test ABCL. - && java -jar /usr/local/share/abcl/abcl.jar --batch --eval '(print (multiple-value-list (lisp-implementation-version)))' - -WORKDIR / - -COPY abcl-wrapper /usr/local/bin/abcl -COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh - -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD ["abcl"] diff --git a/nightly/buster/jdk-15/slim/abcl-wrapper b/nightly/buster/jdk-15/slim/abcl-wrapper deleted file mode 100755 index da76f04365f54d85863e4bd70e3f934c3c21c6d0..0000000000000000000000000000000000000000 --- a/nightly/buster/jdk-15/slim/abcl-wrapper +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -exec java -cp "/usr/local/share/abcl/abcl.jar:$CLASSPATH" \ - -XshowSettings:vm -Dfile.encoding=UTF-8 \ - -XX:CompileThreshold=10 \ - org.armedbear.lisp.Main \ - "$@" diff --git a/nightly/buster/jdk-15/slim/docker-entrypoint.sh b/nightly/buster/jdk-15/slim/docker-entrypoint.sh deleted file mode 100755 index 7f6b5a34d7349c9fbeb8f116018e075bb257005d..0000000000000000000000000000000000000000 --- a/nightly/buster/jdk-15/slim/docker-entrypoint.sh +++ /dev/null @@ -1,8 +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/nightly/buster/jdk-8/Dockerfile b/nightly/buster/jdk-8/Dockerfile deleted file mode 100644 index 59934458cf0abbd304db2188c323fe1112cd3f2f..0000000000000000000000000000000000000000 --- a/nightly/buster/jdk-8/Dockerfile +++ /dev/null @@ -1,139 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# -FROM openjdk:8-jdk-buster - -# Install the packages that buildpack-deps adds on top of -# buildpack-deps:scm. This is a bit odd for a JVM based image, but the CFFI -# project is commonly used and requires a compiler, headers, etc. Additionally, -# this gives a more uniform experience between the different cl-docker-images -# project's images. -RUN set -ex; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - autoconf \ - automake \ - bzip2 \ - default-libmysqlclient-dev \ - dpkg-dev \ - file \ - g++ \ - gcc \ - imagemagick \ - libbz2-dev \ - libc6-dev \ - libcurl4-openssl-dev \ - libdb-dev \ - libevent-dev \ - libffi-dev \ - libgdbm-dev \ - libglib2.0-dev \ - libgmp-dev \ - libjpeg-dev \ - libkrb5-dev \ - liblzma-dev \ - libmagickcore-dev \ - libmagickwand-dev \ - libmaxminddb-dev \ - libncurses5-dev \ - libncursesw5-dev \ - libpng-dev \ - libpq-dev \ - libreadline-dev \ - libsqlite3-dev \ - libssl-dev \ - libtool \ - libwebp-dev \ - libxml2-dev \ - libxslt-dev \ - libyaml-dev \ - make \ - patch \ - unzip \ - xz-utils \ - zlib1g-dev \ - \ - ; \ - rm -rf /var/lib/apt/lists/* - -# Install Maven as it is commonly used with ABCL, including with anything that -# uses CFFI. We install it ourselves instead of basing the image off of maven -# because the maven image only follows openjdk's default OS choice and does not -# provide buster based images for jdk12+. - -ARG MAVEN_VERSION=3.6.3 -ARG MAVEN_SHA=c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0 - -WORKDIR /usr/share/maven - -RUN curl -fsSL https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz > /tmp/apache-maven.tar.gz \ - && echo "${MAVEN_SHA} /tmp/apache-maven.tar.gz" | sha512sum -c - \ - && tar -xzf /tmp/apache-maven.tar.gz --strip-components=1 \ - && rm -f /tmp/apache-maven.tar.gz \ - && ln -s /usr/share/maven/bin/mvn /usr/bin/mvn - -ENV MAVEN_HOME /usr/share/maven - -# Now install ABCL - -ENV ABCL_COMMIT fe57bca48b47bf053f2c3751fe5c8837da4a513e - -WORKDIR /usr/local/src/ - -RUN set -x \ - # Install ant - && ANT_VERSION="1.10.9" \ - && curl -fsSL "https://mirrors.gigenet.com/apache/ant/binaries/apache-ant-$ANT_VERSION-bin.tar.gz" > "ant-$ANT_VERSION.tar.gz" \ - && tar xf "ant-$ANT_VERSION.tar.gz" \ - && PATH="/usr/local/src/apache-ant-$ANT_VERSION/bin:$PATH" \ - && ANT_HOME="/usr/local/src/apache-ant-$ANT_VERSION" \ - && export ANT_HOME \ - # Install ABCL - && curl -fsSL "https://github.com/armedbear/abcl/archive/$ABCL_COMMIT.tar.gz" > "abcl-$ABCL_COMMIT.tar.gz" \ - && tar xf "abcl-$ABCL_COMMIT.tar.gz" \ - && JAVA_MAJOR_VERSION="${JAVA_VERSION%%.*}" \ - && JAVA_MAJOR_VERSION="${JAVA_MAJOR_VERSION%%u*}" \ - && export JAVA_MAJOR_VERSION \ - && mkdir /usr/local/share/abcl/ \ - && mv "abcl-$ABCL_COMMIT" abcl \ - && (cd "abcl" && bash ./ci/create-abcl-properties.bash "openjdk$JAVA_MAJOR_VERSION" && ant && cp dist/* /usr/local/share/abcl && ant clean ) \ - && rm -rf "abcl-$ABCL_COMMIT.tar.gz" ant* apache-ant* \ - && java -jar /usr/local/share/abcl/abcl.jar --eval '(print (multiple-value-list (lisp-implementation-version)))' --eval '(quit)' - -# Add the Quicklisp installer. -WORKDIR /usr/local/share/common-lisp/source/quicklisp/ - -ENV QUICKLISP_SIGNING_KEY D7A3489DDEFE32B7D0E7CC61307965AB028B5FF7 - -RUN set -x \ - && curl -fsSL "https://beta.quicklisp.org/quicklisp.lisp" > quicklisp.lisp \ - && curl -fsSL "https://beta.quicklisp.org/quicklisp.lisp.asc" > quicklisp.lisp.asc \ - && GNUPGHOME="$(mktemp -d)" \ - && export GNUPGHOME \ - && gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "${QUICKLISP_SIGNING_KEY}" \ - && gpg --batch --verify "quicklisp.lisp.asc" "quicklisp.lisp" \ - && rm quicklisp.lisp.asc \ - && rm -rf "$GNUPGHOME" - -# Add the script to trivially install Quicklisp -COPY install-quicklisp /usr/local/bin/install-quicklisp - -# Install cl-launch. In the next release, move this up so that all images can -# share it. -# hadolint ignore=DL3008 -RUN set -x \ - && apt-get update \ - && apt-get install --no-install-recommends -y cl-launch \ - && rm -rf /var/lib/apt/lists/* - -# Add the entrypoint -WORKDIR / - -COPY abcl-wrapper /usr/local/bin/abcl -COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh - -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD ["abcl"] diff --git a/nightly/buster/jdk-8/abcl-wrapper b/nightly/buster/jdk-8/abcl-wrapper deleted file mode 100755 index 033e29a36854202544bbebe1b3a5bedcc6247fd1..0000000000000000000000000000000000000000 --- a/nightly/buster/jdk-8/abcl-wrapper +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -exec java -cp "/usr/local/share/abcl/abcl.jar:$CLASSPATH" \ - -XshowSettings:vm -Dfile.encoding=UTF-8 \ - -XX:+UseG1GC -XX:+AggressiveOpts -XX:CompileThreshold=10 \ - org.armedbear.lisp.Main \ - "$@" diff --git a/nightly/buster/jdk-8/docker-entrypoint.sh b/nightly/buster/jdk-8/docker-entrypoint.sh deleted file mode 100755 index 7f6b5a34d7349c9fbeb8f116018e075bb257005d..0000000000000000000000000000000000000000 --- a/nightly/buster/jdk-8/docker-entrypoint.sh +++ /dev/null @@ -1,8 +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/nightly/buster/jdk-8/install-quicklisp b/nightly/buster/jdk-8/install-quicklisp deleted file mode 100755 index ae80aa54dd8c444805e3b99ebe3251f4ae4429f0..0000000000000000000000000000000000000000 --- a/nightly/buster/jdk-8/install-quicklisp +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh - -if [ -z "$QUICKLISP_DIST_VERSION" ] || [ "$QUICKLISP_DIST_VERSION" = "latest" ]; then - QUICKLISP_DIST_VERSION=nil -else - QUICKLISP_DIST_VERSION="\"quicklisp/$QUICKLISP_DIST_VERSION\"" -fi - -if [ -z "$QUICKLISP_CLIENT_VERSION" ] || [ "$QUICKLISP_CLIENT_VERSION" = "latest" ]; then - QUICKLISP_CLIENT_VERSION=nil -else - QUICKLISP_CLIENT_VERSION="\"$QUICKLISP_CLIENT_VERSION\"" -fi - -abcl --batch \ - --load /usr/local/share/common-lisp/source/quicklisp/quicklisp.lisp \ - --eval "(quicklisp-quickstart:install :dist-version $QUICKLISP_DIST_VERSION :client-version $QUICKLISP_CLIENT_VERSION)" \ - --eval "(when (equalp \"$QUICKLISP_ADD_TO_INIT_FILE\" \"true\") (ql-util:without-prompting (ql:add-to-init-file)))" diff --git a/nightly/buster/jdk-8/slim/Dockerfile b/nightly/buster/jdk-8/slim/Dockerfile deleted file mode 100644 index 7301eece376f949e6c75d22d34d55aa5ea141ee8..0000000000000000000000000000000000000000 --- a/nightly/buster/jdk-8/slim/Dockerfile +++ /dev/null @@ -1,46 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# -FROM openjdk:8-jdk-slim-buster - -ENV ABCL_COMMIT fe57bca48b47bf053f2c3751fe5c8837da4a513e - -WORKDIR /usr/local/src/ - -RUN set -x \ - # Install fetch deps - && apt-get update \ - && apt-get install --no-install-recommends -y curl gnupg dirmngr \ - # Install ant - && ANT_VERSION="1.10.9" \ - && curl -fsSL "https://mirrors.gigenet.com/apache/ant/binaries/apache-ant-$ANT_VERSION-bin.tar.gz" > "ant-$ANT_VERSION.tar.gz" \ - && tar xf "ant-$ANT_VERSION.tar.gz" \ - && PATH="/usr/local/src/apache-ant-$ANT_VERSION/bin:$PATH" \ - && ANT_HOME="/usr/local/src/apache-ant-$ANT_VERSION" \ - && export ANT_HOME \ - # Install ABCL - && curl -fsSL "https://github.com/armedbear/abcl/archive/$ABCL_COMMIT.tar.gz" > "abcl-$ABCL_COMMIT.tar.gz" \ - && tar xf "abcl-$ABCL_COMMIT.tar.gz" \ - && JAVA_MAJOR_VERSION="${JAVA_VERSION%%.*}" \ - && JAVA_MAJOR_VERSION="${JAVA_MAJOR_VERSION%%u*}" \ - && export JAVA_MAJOR_VERSION \ - && mkdir /usr/local/share/abcl/ \ - && (cd "abcl-$ABCL_COMMIT" && bash ./ci/create-abcl-properties.bash "openjdk$JAVA_MAJOR_VERSION" && ant && cp dist/* /usr/local/share/abcl ) \ - && rm -rf abcl* ant* apache-ant* \ - # Remove fetch deps - && apt-get remove -y curl gnupg dirmngr \ - && apt-get autoremove -y \ - && rm -rf /var/lib/apt/lists/* \ - # Smoke test ABCL. - && java -jar /usr/local/share/abcl/abcl.jar --batch --eval '(print (multiple-value-list (lisp-implementation-version)))' - -WORKDIR / - -COPY abcl-wrapper /usr/local/bin/abcl -COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh - -ENTRYPOINT ["docker-entrypoint.sh"] - -CMD ["abcl"] diff --git a/nightly/buster/jdk-8/slim/abcl-wrapper b/nightly/buster/jdk-8/slim/abcl-wrapper deleted file mode 100755 index 033e29a36854202544bbebe1b3a5bedcc6247fd1..0000000000000000000000000000000000000000 --- a/nightly/buster/jdk-8/slim/abcl-wrapper +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -exec java -cp "/usr/local/share/abcl/abcl.jar:$CLASSPATH" \ - -XshowSettings:vm -Dfile.encoding=UTF-8 \ - -XX:+UseG1GC -XX:+AggressiveOpts -XX:CompileThreshold=10 \ - org.armedbear.lisp.Main \ - "$@" diff --git a/nightly/buster/jdk-8/slim/docker-entrypoint.sh b/nightly/buster/jdk-8/slim/docker-entrypoint.sh deleted file mode 100755 index 7f6b5a34d7349c9fbeb8f116018e075bb257005d..0000000000000000000000000000000000000000 --- a/nightly/buster/jdk-8/slim/docker-entrypoint.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -# If the first arg starts with a hyphen, prepend abcl to arguments. -if [ "${1#-}" != "$1" ]; then - set -- abcl "$@" -fi - -exec "$@"