Commit 322697db authored by Eric Timmons's avatar Eric Timmons
Browse files

Upgrade Alpine to 3.13

parent 5cfb923c
Pipeline #2626 passed with stage
in 1 minute and 18 seconds
......@@ -15,7 +15,16 @@ RUN set -x \
&& case "$(cat /etc/apk/arch)" in \
# We use ECL to build because the version of SBCL in the edge repo doesn't
# work for armv7 (edge has updated musl libc incompatibly).
armv7) SBCL_ARCH=arm; HOST_LISP="ecl"; ECL_VERSION=20.4.24; export ECL_VERSION;; \
armv7) \
SBCL_ARCH=arm; \
if grep "3.13" /etc/issue 2>/dev/null >/dev/null ; then \
HOST_LISP="sbcl"; \
else \
HOST_LISP="ecl"; \
ECL_VERSION=20.4.24; \
export ECL_VERSION; \
fi \
;; \
aarch64) SBCL_ARCH=arm64; HOST_LISP="sbcl";; \
x86_64) SBCL_ARCH=x86-64; HOST_LISP="sbcl";; \
*) echo "Unknown arch" >&2; exit 1;; \
......
......@@ -3,7 +3,7 @@
#
# PLEASE DO NOT EDIT IT DIRECTLY.
#
FROM alpine:3.11
FROM alpine:3.13
ENV SBCL_VERSION 2.1.0
ENV SBCL_SIGNING_KEY D6839CA0A67F74D9DFB70922EBD595A9100D63CD
......@@ -15,7 +15,16 @@ RUN set -x \
&& case "$(cat /etc/apk/arch)" in \
# We use ECL to build because the version of SBCL in the edge repo doesn't
# work for armv7 (edge has updated musl libc incompatibly).
armv7) SBCL_ARCH=arm; HOST_LISP="ecl"; ECL_VERSION=20.4.24; export ECL_VERSION;; \
armv7) \
SBCL_ARCH=arm; \
if grep "3.13" /etc/issue 2>/dev/null >/dev/null ; then \
HOST_LISP="sbcl"; \
else \
HOST_LISP="ecl"; \
ECL_VERSION=20.4.24; \
export ECL_VERSION; \
fi \
;; \
aarch64) SBCL_ARCH=arm64; HOST_LISP="sbcl";; \
x86_64) SBCL_ARCH=x86-64; HOST_LISP="sbcl";; \
*) echo "Unknown arch" >&2; exit 1;; \
......
......@@ -10,7 +10,16 @@ RUN set -x \
&& case "$(cat /etc/apk/arch)" in \
# We use ECL to build because the version of SBCL in the edge repo doesn't
# work for armv7 (edge has updated musl libc incompatibly).
armv7) SBCL_ARCH=arm; HOST_LISP="ecl"; ECL_VERSION=20.4.24; export ECL_VERSION;; \
armv7) \
SBCL_ARCH=arm; \
if grep "3.13" /etc/issue 2>/dev/null >/dev/null ; then \
HOST_LISP="sbcl"; \
else \
HOST_LISP="ecl"; \
ECL_VERSION=20.4.24; \
export ECL_VERSION; \
fi \
;; \
aarch64) SBCL_ARCH=arm64; HOST_LISP="sbcl";; \
x86_64) SBCL_ARCH=x86-64; HOST_LISP="sbcl";; \
*) echo "Unknown arch" >&2; exit 1;; \
......
......@@ -82,8 +82,8 @@ for version in "${versions[@]}"; do
for v in \
buster/{,slim} \
stretch/{,slim} \
alpine3.12/{,slim} \
alpine3.11/{,slim} \
alpine3.13/ \
alpine3.12/ \
windowsservercore-{1809,ltsc2016}/ \
; do
os="${v%%/*}"
......
......@@ -38,8 +38,8 @@ for version in "${versions[@]}"; do
for v in \
buster/{,slim} \
stretch/{,slim} \
alpine3.13/ \
alpine3.12/ \
alpine3.11/ \
windowsservercore-{ltsc2016,1809}/ \
; do
os="${v%%/*}"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment