diff --git a/1.7.1/buster/jdk-11/Dockerfile b/1.7.1/buster/jdk-11/Dockerfile index 5868efab6bb68cb5c88b2901c92ed18d1d1a4efd..c5ece4b9764159c28346ea53c47108e685bee32e 100644 --- a/1.7.1/buster/jdk-11/Dockerfile +++ b/1.7.1/buster/jdk-11/Dockerfile @@ -119,6 +119,9 @@ RUN set -x \ && rm quicklisp.lisp.asc \ && rm -rf "$GNUPGHOME" +# Add the script to trivially install Quicklisp +COPY install-quicklisp /usr/local/bin/install-quicklisp + # Add the entrypoint WORKDIR / diff --git a/1.7.1/buster/jdk-11/install-quicklisp b/1.7.1/buster/jdk-11/install-quicklisp new file mode 100755 index 0000000000000000000000000000000000000000..ae80aa54dd8c444805e3b99ebe3251f4ae4429f0 --- /dev/null +++ b/1.7.1/buster/jdk-11/install-quicklisp @@ -0,0 +1,18 @@ +#!/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/1.7.1/buster/jdk-15/Dockerfile b/1.7.1/buster/jdk-15/Dockerfile index 3773eb6eb3cdff3e4413dee9272ef371bc4b127e..127089e92286d5adbf941763892cdd80280b4eca 100644 --- a/1.7.1/buster/jdk-15/Dockerfile +++ b/1.7.1/buster/jdk-15/Dockerfile @@ -119,6 +119,9 @@ RUN set -x \ && rm quicklisp.lisp.asc \ && rm -rf "$GNUPGHOME" +# Add the script to trivially install Quicklisp +COPY install-quicklisp /usr/local/bin/install-quicklisp + # Add the entrypoint WORKDIR / diff --git a/1.7.1/buster/jdk-15/install-quicklisp b/1.7.1/buster/jdk-15/install-quicklisp new file mode 100755 index 0000000000000000000000000000000000000000..ae80aa54dd8c444805e3b99ebe3251f4ae4429f0 --- /dev/null +++ b/1.7.1/buster/jdk-15/install-quicklisp @@ -0,0 +1,18 @@ +#!/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/1.7.1/buster/jdk-8/Dockerfile b/1.7.1/buster/jdk-8/Dockerfile index ac72f600cfea4a597b2a843713ba506f69f59229..5fc2dc8ee46e9169336a064cd4610d3affa60802 100644 --- a/1.7.1/buster/jdk-8/Dockerfile +++ b/1.7.1/buster/jdk-8/Dockerfile @@ -119,6 +119,9 @@ RUN set -x \ && rm quicklisp.lisp.asc \ && rm -rf "$GNUPGHOME" +# Add the script to trivially install Quicklisp +COPY install-quicklisp /usr/local/bin/install-quicklisp + # Add the entrypoint WORKDIR / diff --git a/1.7.1/buster/jdk-8/install-quicklisp b/1.7.1/buster/jdk-8/install-quicklisp new file mode 100755 index 0000000000000000000000000000000000000000..ae80aa54dd8c444805e3b99ebe3251f4ae4429f0 --- /dev/null +++ b/1.7.1/buster/jdk-8/install-quicklisp @@ -0,0 +1,18 @@ +#!/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/1.8.0/buster/jdk-11/Dockerfile b/1.8.0/buster/jdk-11/Dockerfile index 2cd003ce144b08bb30de571ffa07cc02760e7f7c..80ab3ffd4de2094b72073d7326ae9115a979b748 100644 --- a/1.8.0/buster/jdk-11/Dockerfile +++ b/1.8.0/buster/jdk-11/Dockerfile @@ -119,6 +119,9 @@ RUN set -x \ && rm quicklisp.lisp.asc \ && rm -rf "$GNUPGHOME" +# Add the script to trivially install Quicklisp +COPY install-quicklisp /usr/local/bin/install-quicklisp + # Add the entrypoint WORKDIR / diff --git a/1.8.0/buster/jdk-11/install-quicklisp b/1.8.0/buster/jdk-11/install-quicklisp new file mode 100755 index 0000000000000000000000000000000000000000..ae80aa54dd8c444805e3b99ebe3251f4ae4429f0 --- /dev/null +++ b/1.8.0/buster/jdk-11/install-quicklisp @@ -0,0 +1,18 @@ +#!/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/1.8.0/buster/jdk-15/Dockerfile b/1.8.0/buster/jdk-15/Dockerfile index ffc61f98e1a0499bb102501b1ef9518d474b7397..1852ee3dfeebb3ae9a6526f02ee096bf0ebf777c 100644 --- a/1.8.0/buster/jdk-15/Dockerfile +++ b/1.8.0/buster/jdk-15/Dockerfile @@ -119,6 +119,9 @@ RUN set -x \ && rm quicklisp.lisp.asc \ && rm -rf "$GNUPGHOME" +# Add the script to trivially install Quicklisp +COPY install-quicklisp /usr/local/bin/install-quicklisp + # Add the entrypoint WORKDIR / diff --git a/1.8.0/buster/jdk-15/install-quicklisp b/1.8.0/buster/jdk-15/install-quicklisp new file mode 100755 index 0000000000000000000000000000000000000000..ae80aa54dd8c444805e3b99ebe3251f4ae4429f0 --- /dev/null +++ b/1.8.0/buster/jdk-15/install-quicklisp @@ -0,0 +1,18 @@ +#!/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/1.8.0/buster/jdk-8/Dockerfile b/1.8.0/buster/jdk-8/Dockerfile index 7acbcf47ca1de2b3d935b080125b1829eaf973c9..859691dfc53ce4771995b1c8ba0da9fbb34dc15b 100644 --- a/1.8.0/buster/jdk-8/Dockerfile +++ b/1.8.0/buster/jdk-8/Dockerfile @@ -119,6 +119,9 @@ RUN set -x \ && rm quicklisp.lisp.asc \ && rm -rf "$GNUPGHOME" +# Add the script to trivially install Quicklisp +COPY install-quicklisp /usr/local/bin/install-quicklisp + # Add the entrypoint WORKDIR / diff --git a/1.8.0/buster/jdk-8/install-quicklisp b/1.8.0/buster/jdk-8/install-quicklisp new file mode 100755 index 0000000000000000000000000000000000000000..ae80aa54dd8c444805e3b99ebe3251f4ae4429f0 --- /dev/null +++ b/1.8.0/buster/jdk-8/install-quicklisp @@ -0,0 +1,18 @@ +#!/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/Dockerfile-apt-nightly.template b/Dockerfile-apt-nightly.template index a4560d7f74eb5cfb5b862ade868befc2cd3e5f0e..b113e8ff8a3b3fcb0f5feced4b807f74a3807542 100644 --- a/Dockerfile-apt-nightly.template +++ b/Dockerfile-apt-nightly.template @@ -112,6 +112,9 @@ RUN set -x \ && rm quicklisp.lisp.asc \ && rm -rf "$GNUPGHOME" +# Add the script to trivially install Quicklisp +COPY install-quicklisp /usr/local/bin/install-quicklisp + # Add the entrypoint WORKDIR / diff --git a/Dockerfile-apt.template b/Dockerfile-apt.template index 9829d0856e30c37abfe3a8d8f33491f389b9cd53..59cec97bcfc84f02deeba79c58ca32d42d5ef785 100644 --- a/Dockerfile-apt.template +++ b/Dockerfile-apt.template @@ -114,6 +114,9 @@ RUN set -x \ && rm quicklisp.lisp.asc \ && rm -rf "$GNUPGHOME" +# Add the script to trivially install Quicklisp +COPY install-quicklisp /usr/local/bin/install-quicklisp + # Add the entrypoint WORKDIR / diff --git a/hub-description-template.md b/hub-description-template.md index 0d86880d6b1206b03b9c06793d6be4c1e37114a2..7a8b2d841f2d4c8dbf58370a251788d69876595c 100644 --- a/hub-description-template.md +++ b/hub-description-template.md @@ -1,40 +1,40 @@ -- [Supported Tags](#org993f32a) - - [Simple Tags](#org53b48aa) - - [Shared Tags](#org53b8acf) -- [Quick Reference](#org527f30d) -- [What is ABCL?](#orga42142e) -- [How to use this iamge](#org1193d10) - - [Create a `Dockerfile` in your ABCL project](#orge347b1c) - - [Run a single Common Lisp script](#org47a5e04) - - [Developing using SLIME](#orga00c0cd) -- [Image variants](#org3471f08) - - [`%%IMAGE%%:<version>`](#org7bb1458) - - [`%%IMAGE%%:<version>-slim`](#org50bc7f4) - - [`%%IMAGE%%:<version>-windowsservercore`](#org39e2f32) -- [License](#org15ed669) +- [Supported Tags](#org3364b47) + - [Simple Tags](#org9771021) + - [Shared Tags](#org32c4fe2) +- [Quick Reference](#org1c6007b) +- [What is ABCL?](#orgb8ba2c3) +- [How to use this iamge](#org2fe1ebb) + - [Create a `Dockerfile` in your ABCL project](#org874a6cf) + - [Run a single Common Lisp script](#orga43af56) + - [Developing using SLIME](#org0c0787a) +- [Image variants](#org2663dc1) + - [`%%IMAGE%%:<version>`](#orgd984448) + - [`%%IMAGE%%:<version>-slim`](#org61a3189) + - [`%%IMAGE%%:<version>-windowsservercore`](#org4b0cc43) +- [License](#org6e67466) -<a id="org993f32a"></a> +<a id="org3364b47"></a> # Supported Tags -<a id="org53b48aa"></a> +<a id="org9771021"></a> ## Simple Tags INSERT-SIMPLE-TAGS -<a id="org53b8acf"></a> +<a id="org32c4fe2"></a> ## Shared Tags INSERT-SHARED-TAGS -<a id="org527f30d"></a> +<a id="org1c6007b"></a> # Quick Reference @@ -45,7 +45,7 @@ INSERT-SHARED-TAGS - **Supported platforms:** `linux/amd64`, `linux/arm64/v8`, `windows/amd64` -<a id="orga42142e"></a> +<a id="orgb8ba2c3"></a> # What is ABCL? @@ -54,12 +54,12 @@ From [ABCL's Home Page](https://abcl.org) > Armed Bear Common Lisp (ABCL) is a full implementation of the Common Lisp language featuring both an interpreter and a compiler, running in the JVM. Originally started to be a scripting language for the J editor, it now supports JSR-223 (Java scripting API): it can be a scripting engine in any Java application. Additionally, it can be used to implement (parts of) the application using Java to Lisp integration APIs. -<a id="org1193d10"></a> +<a id="org2fe1ebb"></a> # How to use this iamge -<a id="orge347b1c"></a> +<a id="org874a6cf"></a> ## Create a `Dockerfile` in your ABCL project @@ -78,7 +78,7 @@ $ docker run -it --rm --name my-running-app my-abcl-app ``` -<a id="org47a5e04"></a> +<a id="orga43af56"></a> ## Run a single Common Lisp script @@ -89,7 +89,7 @@ $ docker run -it --rm --name my-running-script -v "$PWD":/usr/src/app -w /usr/sr ``` -<a id="orga00c0cd"></a> +<a id="org0c0787a"></a> ## Developing using SLIME @@ -106,14 +106,14 @@ M-x slime-connect RET RET RET ``` -<a id="org3471f08"></a> +<a id="org2663dc1"></a> # Image variants This image comes in several variants, each designed for a specific use case. -<a id="org7bb1458"></a> +<a id="orgd984448"></a> ## `%%IMAGE%%:<version>` @@ -123,17 +123,21 @@ Some of these tags may have names like buster or stretch in them. These are the This tag attempts to replicate the base environment provided by buildpack-deps. It, by design, has a large number of extremely common Debian packages. -These images contain the quicklisp installer, located at `/usr/local/share/common-lisp/source/quicklisp/quicklisp.lisp`. +These images contain the quicklisp installer, located at `/usr/local/share/common-lisp/source/quicklisp/quicklisp.lisp`. Additionally, there is a script at `/usr/local/bin/install-quicklisp` that will use the bundled installer to install Quicklisp. You can configure the Quicklisp install with the following environment variables: +- **`QUICKLISP_DIST_VERSION`:** The dist version to use. Of the form yyyy-mm-dd. `latest` means to install the latest version (the default). +- **`QUICKLISP_CLIENT_VERSION`:** The client version to use. Of the form yyyy-mm-dd. `latest` means to install the latest version (the default). +- **`QUICKLISP_ADD_TO_INIT_FILE`:** If set to `true`, `(ql:add-to-init-file)` is used to add code to the implementation's user init file to load Quicklisp on startup. Not set by default. -<a id="org50bc7f4"></a> + +<a id="org61a3189"></a> ## `%%IMAGE%%:<version>-slim` This image does not contain the common packages contained in the default tag and only contains the minimal packages needed to run ABCL. Unless you are working in an environment where only this image will be deployed and you have space constraints, we highly recommend using the default image of this repository. -<a id="org39e2f32"></a> +<a id="org4b0cc43"></a> ## `%%IMAGE%%:<version>-windowsservercore` @@ -145,7 +149,7 @@ For information about how to get Docker running on Windows, please see the relev - [Windows 10 Quick Start](https://msdn.microsoft.com/en-us/virtualization/windowscontainers/quick_start/quick_start_windows_10) -<a id="org15ed669"></a> +<a id="org6e67466"></a> # License diff --git a/hub-description-template.org b/hub-description-template.org index 4707afb4bfb5daf61493033e0f4826a034beff4e..dd5f041cce167f74ffbde53d14bbf4ef4872208b 100644 --- a/hub-description-template.org +++ b/hub-description-template.org @@ -97,7 +97,18 @@ packages. These images contain the quicklisp installer, located at - =/usr/local/share/common-lisp/source/quicklisp/quicklisp.lisp=. + =/usr/local/share/common-lisp/source/quicklisp/quicklisp.lisp=. Additionally, + there is a script at =/usr/local/bin/install-quicklisp= that will use the + bundled installer to install Quicklisp. You can configure the Quicklisp + install with the following environment variables: + + + =QUICKLISP_DIST_VERSION= :: The dist version to use. Of the form + yyyy-mm-dd. =latest= means to install the latest version (the default). + + =QUICKLISP_CLIENT_VERSION= :: The client version to use. Of the form + yyyy-mm-dd. =latest= means to install the latest version (the default). + + =QUICKLISP_ADD_TO_INIT_FILE= :: If set to =true=, =(ql:add-to-init-file)= + is used to add code to the implementation's user init file to load + Quicklisp on startup. Not set by default. ** =%%IMAGE%%:<version>-slim= diff --git a/install-quicklisp b/install-quicklisp new file mode 100755 index 0000000000000000000000000000000000000000..ae80aa54dd8c444805e3b99ebe3251f4ae4429f0 --- /dev/null +++ b/install-quicklisp @@ -0,0 +1,18 @@ +#!/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/update.sh b/update.sh index 7af9e9dbe41ffc62fc66970c16e291b577847c04..474de04a0419914b6dbdee7c96dac2e52c0530f7 100755 --- a/update.sh +++ b/update.sh @@ -57,6 +57,9 @@ for version in "${versions[@]}"; do template="apt$variantTag" cp "abcl-wrapper-jdk$javaVersion" "$dir/abcl-wrapper" cp docker-entrypoint.sh "$dir/docker-entrypoint.sh" + if [ "$variant" != "slim" ]; then + cp install-quicklisp "$dir/install-quicklisp" + fi ;; windowsservercore-*) template='windowsservercore'