Commit 9c0cfd4d authored by Eric Timmons's avatar Eric Timmons
Browse files

Update base images

Add bullseye, remove stretch, remove ltsc2016, add ltsc2019
parent c831357b
......@@ -3,9 +3,9 @@
#
# PLEASE DO NOT EDIT IT DIRECTLY.
#
FROM buildpack-deps:stretch
FROM buildpack-deps:bullseye
ENV CCL_VERSION 1.12
ENV CCL_VERSION 1.12.1
WORKDIR /usr/local/src/
......@@ -38,7 +38,7 @@ RUN set -x \
&& 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 --keyserver keyserver.ubuntu.com --recv-keys "${QUICKLISP_SIGNING_KEY}" \
&& gpg --batch --verify "quicklisp.lisp.asc" "quicklisp.lisp" \
&& rm quicklisp.lisp.asc \
&& rm -rf "$GNUPGHOME"
......
......@@ -3,9 +3,9 @@
#
# PLEASE DO NOT EDIT IT DIRECTLY.
#
FROM debian:stretch
FROM debian:bullseye
ENV CCL_VERSION 1.12
ENV CCL_VERSION 1.12.1
WORKDIR /usr/local/src/
......
......@@ -5,7 +5,7 @@
#
FROM buildpack-deps:buster
ENV CCL_VERSION 1.12
ENV CCL_VERSION 1.12.1
WORKDIR /usr/local/src/
......@@ -38,7 +38,7 @@ RUN set -x \
&& 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 --keyserver keyserver.ubuntu.com --recv-keys "${QUICKLISP_SIGNING_KEY}" \
&& gpg --batch --verify "quicklisp.lisp.asc" "quicklisp.lisp" \
&& rm quicklisp.lisp.asc \
&& rm -rf "$GNUPGHOME"
......
......@@ -5,7 +5,7 @@
#
FROM debian:buster
ENV CCL_VERSION 1.12
ENV CCL_VERSION 1.12.1
WORKDIR /usr/local/src/
......
......@@ -8,7 +8,48 @@ FROM mcr.microsoft.com/windows/servercore:1809
# Switch to powershell and make sure it exits on error
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop';"]
ENV CCL_VERSION=1.12
ENV MSYS2_VERSION 20210725
# Install msys and update it.
RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
Invoke-WebRequest -UseBasicParsing -uri "https://github.com/msys2/msys2-installer/releases/download/2021-07-25/msys2-base-x86_64-$env:MSYS2_VERSION.sfx.exe" -OutFile msys2.exe; \
.\msys2.exe -y -oC:\; \
Remove-Item msys2.exe ; \
function msys() { C:\msys64\usr\bin\bash.exe @('-lc') + @Args; } \
msys ' '; \
msys 'pacman --noconfirm -Syuu'; \
msys 'pacman --noconfirm -Syuu'; \
msys 'pacman --noconfirm -Scc'; \
\
echo 'Killing msys2 subprocesses'; \
taskkill /F /FI 'MODULES eq msys-2.0.dll'; \
\
echo 'Clearing Recycle Bin (see https://github.com/docker/for-win/issues/8910)'; \
If (Test-Path 'C:\$Recycle.Bin') { Remove-Item -Force -Recurse -Path 'C:\$Recycle.Bin'; };
# Install common tools. Eventually make this equivalent to buildpack-deps.
RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
function msys() { C:\msys64\usr\bin\bash.exe @('-lc') + @Args; } \
$env:CHERE_INVOKING = 'yes'; \
$env:MSYSTEM = 'MINGW64'; \
msys 'pacman -S --noconfirm --needed mingw-w64-x86_64-gcc make diffutils tar unzip mingw-w64-x86_64-zlib git' \
\
echo 'Installing WIX.'; \
Invoke-WebRequest -Uri 'https://github.com/wixtoolset/wix3/releases/download/wix3112rtm/wix311-binaries.zip' -OutFile wix311-binaries.zip; \
mkdir wix/bin; \
cd wix/bin; \
msys 'unzip ../../wix311-binaries.zip'; \
cd ../../; \
rm wix311-binaries.zip; \
\
echo 'Killing msys2 subprocesses'; \
taskkill /F /FI 'MODULES eq msys-2.0.dll'; \
\
echo 'Clearing Recycle Bin (see https://github.com/docker/for-win/issues/8910)'; \
If (Test-Path 'C:\$Recycle.Bin') { Remove-Item -Force -Recurse -Path 'C:\$Recycle.Bin'; };
ENV CCL_VERSION=1.12.1
RUN $srcurl = ('https://github.com/Clozure/ccl/releases/download/v{0}/ccl-{0}-windowsx86.zip' -f $env:CCL_VERSION); \
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
......
......@@ -3,12 +3,53 @@
#
# PLEASE DO NOT EDIT IT DIRECTLY.
#
FROM mcr.microsoft.com/windows/servercore:ltsc2016
FROM mcr.microsoft.com/windows/servercore:ltsc2019
# Switch to powershell and make sure it exits on error
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop';"]
ENV CCL_VERSION=1.12
ENV MSYS2_VERSION 20210725
# Install msys and update it.
RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
Invoke-WebRequest -UseBasicParsing -uri "https://github.com/msys2/msys2-installer/releases/download/2021-07-25/msys2-base-x86_64-$env:MSYS2_VERSION.sfx.exe" -OutFile msys2.exe; \
.\msys2.exe -y -oC:\; \
Remove-Item msys2.exe ; \
function msys() { C:\msys64\usr\bin\bash.exe @('-lc') + @Args; } \
msys ' '; \
msys 'pacman --noconfirm -Syuu'; \
msys 'pacman --noconfirm -Syuu'; \
msys 'pacman --noconfirm -Scc'; \
\
echo 'Killing msys2 subprocesses'; \
taskkill /F /FI 'MODULES eq msys-2.0.dll'; \
\
echo 'Clearing Recycle Bin (see https://github.com/docker/for-win/issues/8910)'; \
If (Test-Path 'C:\$Recycle.Bin') { Remove-Item -Force -Recurse -Path 'C:\$Recycle.Bin'; };
# Install common tools. Eventually make this equivalent to buildpack-deps.
RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
function msys() { C:\msys64\usr\bin\bash.exe @('-lc') + @Args; } \
$env:CHERE_INVOKING = 'yes'; \
$env:MSYSTEM = 'MINGW64'; \
msys 'pacman -S --noconfirm --needed mingw-w64-x86_64-gcc make diffutils tar unzip mingw-w64-x86_64-zlib git' \
\
echo 'Installing WIX.'; \
Invoke-WebRequest -Uri 'https://github.com/wixtoolset/wix3/releases/download/wix3112rtm/wix311-binaries.zip' -OutFile wix311-binaries.zip; \
mkdir wix/bin; \
cd wix/bin; \
msys 'unzip ../../wix311-binaries.zip'; \
cd ../../; \
rm wix311-binaries.zip; \
\
echo 'Killing msys2 subprocesses'; \
taskkill /F /FI 'MODULES eq msys-2.0.dll'; \
\
echo 'Clearing Recycle Bin (see https://github.com/docker/for-win/issues/8910)'; \
If (Test-Path 'C:\$Recycle.Bin') { Remove-Item -Force -Recurse -Path 'C:\$Recycle.Bin'; };
ENV CCL_VERSION=1.12.1
RUN $srcurl = ('https://github.com/Clozure/ccl/releases/download/v{0}/ccl-{0}-windowsx86.zip' -f $env:CCL_VERSION); \
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
......
......@@ -34,7 +34,7 @@ RUN set -x \
&& 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 --keyserver keyserver.ubuntu.com --recv-keys "${QUICKLISP_SIGNING_KEY}" \
&& gpg --batch --verify "quicklisp.lisp.asc" "quicklisp.lisp" \
&& rm quicklisp.lisp.asc \
&& rm -rf "$GNUPGHOME"
......
......@@ -33,7 +33,7 @@ RUN set -x \
&& 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 --keyserver keyserver.ubuntu.com --recv-keys "${QUICKLISP_SIGNING_KEY}" \
&& gpg --batch --verify "quicklisp.lisp.asc" "quicklisp.lisp" \
&& rm quicklisp.lisp.asc \
&& rm -rf "$GNUPGHOME"
......
......@@ -3,7 +3,48 @@ FROM PLACEHOLDER
# Switch to powershell and make sure it exits on error
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop';"]
ENV CCL_VERSION=1.12
ENV MSYS2_VERSION 20210725
# Install msys and update it.
RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
Invoke-WebRequest -UseBasicParsing -uri "https://github.com/msys2/msys2-installer/releases/download/2021-07-25/msys2-base-x86_64-$env:MSYS2_VERSION.sfx.exe" -OutFile msys2.exe; \
.\msys2.exe -y -oC:\; \
Remove-Item msys2.exe ; \
function msys() { C:\msys64\usr\bin\bash.exe @('-lc') + @Args; } \
msys ' '; \
msys 'pacman --noconfirm -Syuu'; \
msys 'pacman --noconfirm -Syuu'; \
msys 'pacman --noconfirm -Scc'; \
\
echo 'Killing msys2 subprocesses'; \
taskkill /F /FI 'MODULES eq msys-2.0.dll'; \
\
echo 'Clearing Recycle Bin (see https://github.com/docker/for-win/issues/8910)'; \
If (Test-Path 'C:\$Recycle.Bin') { Remove-Item -Force -Recurse -Path 'C:\$Recycle.Bin'; };
# Install common tools. Eventually make this equivalent to buildpack-deps.
RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
function msys() { C:\msys64\usr\bin\bash.exe @('-lc') + @Args; } \
$env:CHERE_INVOKING = 'yes'; \
$env:MSYSTEM = 'MINGW64'; \
msys 'pacman -S --noconfirm --needed mingw-w64-x86_64-gcc make diffutils tar unzip mingw-w64-x86_64-zlib git' \
\
echo 'Installing WIX.'; \
Invoke-WebRequest -Uri 'https://github.com/wixtoolset/wix3/releases/download/wix3112rtm/wix311-binaries.zip' -OutFile wix311-binaries.zip; \
mkdir wix/bin; \
cd wix/bin; \
msys 'unzip ../../wix311-binaries.zip'; \
cd ../../; \
rm wix311-binaries.zip; \
\
echo 'Killing msys2 subprocesses'; \
taskkill /F /FI 'MODULES eq msys-2.0.dll'; \
\
echo 'Clearing Recycle Bin (see https://github.com/docker/for-win/issues/8910)'; \
If (Test-Path 'C:\$Recycle.Bin') { Remove-Item -Force -Recurse -Path 'C:\$Recycle.Bin'; };
ENV CCL_VERSION=1.12.1
RUN $srcurl = ('https://github.com/Clozure/ccl/releases/download/v{0}/ccl-{0}-windowsx86.zip' -f $env:CCL_VERSION); \
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
......
......@@ -2,7 +2,7 @@
set -Eeuo pipefail
declare -A aliases=(
[1.12]='latest 1 1.12.0'
[1.12.1]='latest 1 1.12'
)
defaultDebianSuite='buster'
......@@ -10,17 +10,16 @@ defaultDebianSuite='buster'
self="$(basename "$BASH_SOURCE")"
cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
if [ "${1-unset}" = "nightly" ]; then
versions=( nightly )
aliases[nightly]="$(grep -e "^ENV CCL_COMMIT" nightly/buster/Dockerfile | cut -d" " -f 3 | head -c 7)"
if [ "${1-unset}" = "rc" ]; then
versions=( *rc/ )
versions=( "${versions[@]%/}" )
elif [ "${1-unset}" = "all" ]; then
versions=( */ )
versions=( "${versions[@]%/}" )
aliases[nightly]="$(grep -e "^ENV CCL_COMMIT" nightly/buster/Dockerfile | cut -d" " -f 3 | head -c 7)"
else
versions=( */ )
versions=( "${versions[@]%/}" )
versions=( "${versions[@]/nightly}" )
versions=( "${versions[@]%%*rc}" )
fi
# sort version numbers with highest first
......@@ -62,7 +61,16 @@ getArches() {
| xargs bashbrew cat --format '[{{ .RepoName }}:{{ .TagName }}]="{{ join " " .TagEntry.Architectures }}"'
) )"
}
getArches 'ccl'
# getArches 'ccl'
declare -g -A parentRepoToArches=(
[alpine:3.13]="amd64 arm32v6 arm32v7 arm64v8 i386 ppc64le s390x"
[alpine:3.14]="amd64 arm32v6 arm32v7 arm64v8 i386 ppc64le s390x"
[buildpack-deps:bullseye]="amd64 arm32v6 arm32v7 arm64v8 i386 ppc64le s390x"
[buildpack-deps:buster]="amd64 arm32v6 arm32v7 arm64v8 i386 ppc64le s390x"
[debian:bullseye]="amd64 arm32v6 arm32v7 arm64v8 i386 ppc64le s390x"
[debian:buster]="amd64 arm32v6 arm32v7 arm64v8 i386 ppc64le s390x"
)
cat <<-EOH
# this file is generated via https://github.com/cl-docker-images/ccl/blob/$(fileCommit "$self")/$self
......@@ -80,9 +88,9 @@ join() {
for version in "${versions[@]}"; do
for v in \
bullseye/{,slim} \
buster/{,slim} \
stretch/{,slim} \
windowsservercore-{1809,ltsc2016}/ \
windowsservercore-{1809,ltsc2019}/ \
; do
os="${v%%/*}"
variant="${v#*/}"
......@@ -94,8 +102,10 @@ for version in "${versions[@]}"; do
dir="$version/$v"
if [ "$version" = "nightly" ] && [[ "$os" == "windowsservercore"* ]]; then
continue
if [[ "$version" == *rc ]]; then
if [[ "$os" == "windowsservercore"* ]] || [ "$variant" = slim ]; then
continue
fi
fi
[ -f "$dir/Dockerfile" ] || continue
......
#!/bin/sh
# If the first arg starts with a hyphen, prepend ccl to arguments.
if [ "${1#-}" != "$1" ]; then
set -- ccl "$@"
fi
exec "$@"
#!/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
ccl --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)))" \
--eval "(quit)"
#!/bin/sh
# If the first arg starts with a hyphen, prepend ccl to arguments.
if [ "${1#-}" != "$1" ]; then
set -- ccl "$@"
fi
exec "$@"
#!/bin/sh
# If the first arg starts with a hyphen, prepend ccl to arguments.
if [ "${1#-}" != "$1" ]; then
set -- ccl "$@"
fi
exec "$@"
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