From a7202756ab01ba650e8adf84430a4ee8a70d29c4 Mon Sep 17 00:00:00 2001 From: Disassembler Date: Thu, 22 Oct 2020 20:45:13 +0200 Subject: [PATCH] Bump shared images based on Alpine 3.8, 3.10, 3.11 Remove custom repo key on 3.11 --- lxc-shared/alpine3.10-nodejs10/image | 4 ++-- lxc-shared/alpine3.10-python2.7/image | 8 -------- lxc-shared/alpine3.10/image | 2 +- lxc-shared/alpine3.11-python2.7/image | 4 ++-- lxc-shared/alpine3.11/image | 4 +--- .../image.d/etc/apk/keys/repo.spotter.cz.rsa.pub | 9 --------- lxc-shared/alpine3.11/image.d/etc/apk/repositories | 3 --- lxc-shared/alpine3.8-java8/image | 4 ++-- lxc-shared/alpine3.8-ruby2.4/image | 6 +++--- lxc-shared/alpine3.8/image | 2 +- 10 files changed, 12 insertions(+), 34 deletions(-) delete mode 100644 lxc-shared/alpine3.10-python2.7/image delete mode 100644 lxc-shared/alpine3.11/image.d/etc/apk/keys/repo.spotter.cz.rsa.pub delete mode 100644 lxc-shared/alpine3.11/image.d/etc/apk/repositories diff --git a/lxc-shared/alpine3.10-nodejs10/image b/lxc-shared/alpine3.10-nodejs10/image index b915602..6cb1919 100644 --- a/lxc-shared/alpine3.10-nodejs10/image +++ b/lxc-shared/alpine3.10-nodejs10/image @@ -1,5 +1,5 @@ -IMAGE alpine3.10-nodejs10_10.19.0-200621 -FROM alpine3.10_3.10.5-200621 +IMAGE alpine3.10-nodejs10_10.19.0-201021 +FROM alpine3.10_3.10.5-201021 RUN EOF apk --no-cache add nodejs diff --git a/lxc-shared/alpine3.10-python2.7/image b/lxc-shared/alpine3.10-python2.7/image deleted file mode 100644 index 92a28a4..0000000 --- a/lxc-shared/alpine3.10-python2.7/image +++ /dev/null @@ -1,8 +0,0 @@ -IMAGE alpine3.10-python2.7_2.7.18-200621 -FROM alpine3.10_3.10.5-200621 - -RUN EOF - apk --no-cache add python2 -EOF - -CMD /usr/bin/python diff --git a/lxc-shared/alpine3.10/image b/lxc-shared/alpine3.10/image index 314c1cc..bb69758 100644 --- a/lxc-shared/alpine3.10/image +++ b/lxc-shared/alpine3.10/image @@ -1,4 +1,4 @@ -IMAGE alpine3.10_3.10.5-200621 +IMAGE alpine3.10_3.10.5-201021 COPY https://github.com/alpinelinux/docker-alpine/raw/v3.10/x86_64/alpine-minirootfs-3.10.5-x86_64.tar.gz diff --git a/lxc-shared/alpine3.11-python2.7/image b/lxc-shared/alpine3.11-python2.7/image index 4a0469b..09ae1aa 100644 --- a/lxc-shared/alpine3.11-python2.7/image +++ b/lxc-shared/alpine3.11-python2.7/image @@ -1,5 +1,5 @@ -IMAGE alpine3.11-python2.7_2.7.18-200621 -FROM alpine3.11_3.11.6-200621 +IMAGE alpine3.11-python2.7_2.7.18-201021 +FROM alpine3.11_3.11.6-201021 RUN EOF apk --no-cache add python2 diff --git a/lxc-shared/alpine3.11/image b/lxc-shared/alpine3.11/image index 022c71e..bc5eb41 100644 --- a/lxc-shared/alpine3.11/image +++ b/lxc-shared/alpine3.11/image @@ -1,4 +1,4 @@ -IMAGE alpine3.11_3.11.6-200621 +IMAGE alpine3.11_3.11.6-201021 COPY https://github.com/alpinelinux/docker-alpine/raw/v3.11/x86_64/alpine-minirootfs-3.11.6-x86_64.tar.gz @@ -17,5 +17,3 @@ RUN EOF # Cleanup rm -rf /etc/crontabs/root /etc/periodic EOF - -COPY image.d diff --git a/lxc-shared/alpine3.11/image.d/etc/apk/keys/repo.spotter.cz.rsa.pub b/lxc-shared/alpine3.11/image.d/etc/apk/keys/repo.spotter.cz.rsa.pub deleted file mode 100644 index 81c90a8..0000000 --- a/lxc-shared/alpine3.11/image.d/etc/apk/keys/repo.spotter.cz.rsa.pub +++ /dev/null @@ -1,9 +0,0 @@ ------BEGIN PUBLIC KEY----- -MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqoNig96JdNCBGE60FMKN -9mD8DrcDIIwl06r+lTnQuLfNxEYxLCS06zlGVQ5o7bJBOZumMZNWdINpa5j8378/ -M6ieDxmd4YErcLobNnYlubp1qVljVcK8luPtvVrQ4O+Ss9owO97qJHKsXF1U2jgE -29QkIGPj+5IfkkbTeGP5T1o9ySmu6AQ+yjGi+ohUtnF5cR+cPb1cJR2XhirS0yLN -E+9E7tcTfILIgxGfCshwdSrZ67fknPZmB+8QpWypd0rlG4lf4kjrY/pZ0Jlu2JxX -BjdgUB4rzcNk99UZfkp2BbGtNYjZ4PZukOl8AYX14bdDSja2W6TcLnGfCqHZRCjW -HwIDAQAB ------END PUBLIC KEY----- diff --git a/lxc-shared/alpine3.11/image.d/etc/apk/repositories b/lxc-shared/alpine3.11/image.d/etc/apk/repositories deleted file mode 100644 index a99e30b..0000000 --- a/lxc-shared/alpine3.11/image.d/etc/apk/repositories +++ /dev/null @@ -1,3 +0,0 @@ -http://dl-cdn.alpinelinux.org/alpine/v3.11/main -http://dl-cdn.alpinelinux.org/alpine/v3.11/community -@vm https://repo.spotter.cz/alpine/v3.11/apk diff --git a/lxc-shared/alpine3.8-java8/image b/lxc-shared/alpine3.8-java8/image index 42ea2a6..9f43528 100644 --- a/lxc-shared/alpine3.8-java8/image +++ b/lxc-shared/alpine3.8-java8/image @@ -1,5 +1,5 @@ -IMAGE alpine3.8-java8_8.222.10-200621 -FROM alpine3.8_3.8.5-200621 +IMAGE alpine3.8-java8_8.222.10-201310 +FROM alpine3.8_3.8.5-201021 RUN EOF apk --no-cache add openjdk8-jre-base diff --git a/lxc-shared/alpine3.8-ruby2.4/image b/lxc-shared/alpine3.8-ruby2.4/image index 0717e95..1241cd3 100644 --- a/lxc-shared/alpine3.8-ruby2.4/image +++ b/lxc-shared/alpine3.8-ruby2.4/image @@ -1,5 +1,5 @@ -IMAGE alpine3.8-ruby2.4_2.4.9-200621 -FROM alpine3.8_3.8.5-200621 +IMAGE alpine3.8-ruby2.4_2.4.10-201021 +FROM alpine3.8_3.8.5-201021 RUN EOF # Install Ruby runtime dependencies @@ -10,7 +10,7 @@ RUN EOF # Download and unpack Ruby mkdir -p /usr/src/ruby - wget http://cache.ruby-lang.org/pub/ruby/2.4/ruby-2.4.9.tar.xz -O - | tar xJf - -C /usr/src/ruby --strip-components=1 + wget http://cache.ruby-lang.org/pub/ruby/2.4/ruby-2.4.10.tar.xz -O - | tar xJf - -C /usr/src/ruby --strip-components=1 # Compile and install Ruby cd /usr/src/ruby diff --git a/lxc-shared/alpine3.8/image b/lxc-shared/alpine3.8/image index 32f3e28..cb6885d 100644 --- a/lxc-shared/alpine3.8/image +++ b/lxc-shared/alpine3.8/image @@ -1,4 +1,4 @@ -IMAGE alpine3.8_3.8.5-200621 +IMAGE alpine3.8_3.8.5-201021 COPY https://github.com/alpinelinux/docker-alpine/raw/v3.8/x86_64/alpine-minirootfs-3.8.5-x86_64.tar.gz