From 596955f6b44332173062717d29219289b2afad3e Mon Sep 17 00:00:00 2001 From: Disassembler Date: Thu, 22 Oct 2020 20:42:45 +0200 Subject: [PATCH] Bump shared images to Alpine 12 --- lxc-shared/alpine3.11-java8/image | 6 ------ lxc-shared/alpine3.11-python3.8/image | 9 --------- lxc-shared/alpine3.12-java8/image | 6 ++++++ .../{alpine3.11-php7.3 => alpine3.12-php7.3}/image | 4 ++-- lxc-shared/alpine3.12-python3.8/image | 9 +++++++++ .../{alpine3.11-ruby2.4 => alpine3.12-ruby2.4}/image | 6 +++--- .../{alpine3.11-ruby2.6 => alpine3.12-ruby2.6}/image | 4 ++-- .../{alpine3.11-tomcat7 => alpine3.12-tomcat7}/image | 6 +++--- .../image.d/srv/tomcat/bin/setenv.sh | 0 .../image.d/srv/tomcat/conf/logging.properties | 0 .../{alpine3.11-tomcat8.5 => alpine3.12-tomcat8.5}/image | 6 +++--- .../image.d/srv/tomcat/bin/setenv.sh | 0 .../image.d/srv/tomcat/conf/logging.properties | 0 lxc-shared/alpine3.12/image | 4 ++-- 14 files changed, 30 insertions(+), 30 deletions(-) delete mode 100644 lxc-shared/alpine3.11-java8/image delete mode 100644 lxc-shared/alpine3.11-python3.8/image create mode 100644 lxc-shared/alpine3.12-java8/image rename lxc-shared/{alpine3.11-php7.3 => alpine3.12-php7.3}/image (69%) create mode 100644 lxc-shared/alpine3.12-python3.8/image rename lxc-shared/{alpine3.11-ruby2.4 => alpine3.12-ruby2.4}/image (80%) rename lxc-shared/{alpine3.11-ruby2.6 => alpine3.12-ruby2.6}/image (92%) rename lxc-shared/{alpine3.11-tomcat7 => alpine3.12-tomcat7}/image (83%) rename lxc-shared/{alpine3.11-tomcat7 => alpine3.12-tomcat7}/image.d/srv/tomcat/bin/setenv.sh (100%) rename lxc-shared/{alpine3.11-tomcat7 => alpine3.12-tomcat7}/image.d/srv/tomcat/conf/logging.properties (100%) rename lxc-shared/{alpine3.11-tomcat8.5 => alpine3.12-tomcat8.5}/image (76%) rename lxc-shared/{alpine3.11-tomcat8.5 => alpine3.12-tomcat8.5}/image.d/srv/tomcat/bin/setenv.sh (100%) rename lxc-shared/{alpine3.11-tomcat8.5 => alpine3.12-tomcat8.5}/image.d/srv/tomcat/conf/logging.properties (100%) diff --git a/lxc-shared/alpine3.11-java8/image b/lxc-shared/alpine3.11-java8/image deleted file mode 100644 index b503d7d..0000000 --- a/lxc-shared/alpine3.11-java8/image +++ /dev/null @@ -1,6 +0,0 @@ -IMAGE alpine3.11-java8_8.242.08-200621 -FROM alpine3.11_3.11.6-200621 - -RUN EOF - apk --no-cache add openjdk8-jre-base -EOF diff --git a/lxc-shared/alpine3.11-python3.8/image b/lxc-shared/alpine3.11-python3.8/image deleted file mode 100644 index a5f54bf..0000000 --- a/lxc-shared/alpine3.11-python3.8/image +++ /dev/null @@ -1,9 +0,0 @@ -IMAGE alpine3.11-python3.8_3.8.2-200621 -FROM alpine3.11_3.11.6-200621 - -RUN EOF - apk --no-cache add python3 - ln -s /usr/bin/python3 /usr/bin/python -EOF - -CMD /usr/bin/python diff --git a/lxc-shared/alpine3.12-java8/image b/lxc-shared/alpine3.12-java8/image new file mode 100644 index 0000000..104daab --- /dev/null +++ b/lxc-shared/alpine3.12-java8/image @@ -0,0 +1,6 @@ +IMAGE alpine3.12-java8_8.252.09-201021 +FROM alpine3.12_3.12.1-201021 + +RUN EOF + apk --no-cache add openjdk8-jre-base +EOF diff --git a/lxc-shared/alpine3.11-php7.3/image b/lxc-shared/alpine3.12-php7.3/image similarity index 69% rename from lxc-shared/alpine3.11-php7.3/image rename to lxc-shared/alpine3.12-php7.3/image index 456a19a..2f7e623 100644 --- a/lxc-shared/alpine3.11-php7.3/image +++ b/lxc-shared/alpine3.12-php7.3/image @@ -1,5 +1,5 @@ -IMAGE alpine3.11-php7.3_7.3.18-200621 -FROM alpine3.11_3.11.6-200621 +IMAGE alpine3.12-php7.3_7.3.23-201021 +FROM alpine3.12_3.12.1-201021 RUN EOF apk --no-cache add nginx php7 php7-ctype php7-fpm php7-gd php7-json php7-mbstring php7-mcrypt php7-opcache php7-session diff --git a/lxc-shared/alpine3.12-python3.8/image b/lxc-shared/alpine3.12-python3.8/image new file mode 100644 index 0000000..4085484 --- /dev/null +++ b/lxc-shared/alpine3.12-python3.8/image @@ -0,0 +1,9 @@ +IMAGE alpine3.12-python3.8_3.8.5-201021 +FROM alpine3.12_3.12.1-201021 + +RUN EOF + apk --no-cache add python3 py3-pip py3-wheel + ln -s /usr/bin/python3 /usr/bin/python +EOF + +CMD /usr/bin/python diff --git a/lxc-shared/alpine3.11-ruby2.4/image b/lxc-shared/alpine3.12-ruby2.4/image similarity index 80% rename from lxc-shared/alpine3.11-ruby2.4/image rename to lxc-shared/alpine3.12-ruby2.4/image index 8589581..bf768db 100644 --- a/lxc-shared/alpine3.11-ruby2.4/image +++ b/lxc-shared/alpine3.12-ruby2.4/image @@ -1,5 +1,5 @@ -IMAGE alpine3.11-ruby2.4_2.4.9-200621 -FROM alpine3.11_3.11.6-200621 +IMAGE alpine3.12-ruby2.4_2.4.10-201021 +FROM alpine3.12_3.12.1-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.11-ruby2.6/image b/lxc-shared/alpine3.12-ruby2.6/image similarity index 92% rename from lxc-shared/alpine3.11-ruby2.6/image rename to lxc-shared/alpine3.12-ruby2.6/image index 41a8e83..4a33bf6 100644 --- a/lxc-shared/alpine3.11-ruby2.6/image +++ b/lxc-shared/alpine3.12-ruby2.6/image @@ -1,5 +1,5 @@ -IMAGE alpine3.11-ruby2.6_2.6.6-201004 -FROM alpine3.11_3.11.6-200621 +IMAGE alpine3.12-ruby2.6_2.6.6-201021 +FROM alpine3.12_3.12.1-201021 RUN EOF # Install Ruby runtime dependencies diff --git a/lxc-shared/alpine3.11-tomcat7/image b/lxc-shared/alpine3.12-tomcat7/image similarity index 83% rename from lxc-shared/alpine3.11-tomcat7/image rename to lxc-shared/alpine3.12-tomcat7/image index 7696cc1..5fd2d14 100644 --- a/lxc-shared/alpine3.11-tomcat7/image +++ b/lxc-shared/alpine3.12-tomcat7/image @@ -1,9 +1,9 @@ -IMAGE alpine3.11-tomcat7_7.0.104-200621 -FROM alpine3.11-java8_8.242.08-200621 +IMAGE alpine3.12-tomcat7_7.0.106-201021 +FROM alpine3.12-java8_8.252.09-201021 RUN EOF # Install Tomcat 7 - wget https://archive.apache.org/dist/tomcat/tomcat-7/v7.0.104/bin/apache-tomcat-7.0.104.tar.gz -O - | tar xzf - -C /srv + wget https://archive.apache.org/dist/tomcat/tomcat-7/v7.0.106/bin/apache-tomcat-7.0.106.tar.gz -O - | tar xzf - -C /srv mv /srv/apache-tomcat-* /srv/tomcat # Make catalina.sh available globally diff --git a/lxc-shared/alpine3.11-tomcat7/image.d/srv/tomcat/bin/setenv.sh b/lxc-shared/alpine3.12-tomcat7/image.d/srv/tomcat/bin/setenv.sh similarity index 100% rename from lxc-shared/alpine3.11-tomcat7/image.d/srv/tomcat/bin/setenv.sh rename to lxc-shared/alpine3.12-tomcat7/image.d/srv/tomcat/bin/setenv.sh diff --git a/lxc-shared/alpine3.11-tomcat7/image.d/srv/tomcat/conf/logging.properties b/lxc-shared/alpine3.12-tomcat7/image.d/srv/tomcat/conf/logging.properties similarity index 100% rename from lxc-shared/alpine3.11-tomcat7/image.d/srv/tomcat/conf/logging.properties rename to lxc-shared/alpine3.12-tomcat7/image.d/srv/tomcat/conf/logging.properties diff --git a/lxc-shared/alpine3.11-tomcat8.5/image b/lxc-shared/alpine3.12-tomcat8.5/image similarity index 76% rename from lxc-shared/alpine3.11-tomcat8.5/image rename to lxc-shared/alpine3.12-tomcat8.5/image index 966f10a..ab8295b 100644 --- a/lxc-shared/alpine3.11-tomcat8.5/image +++ b/lxc-shared/alpine3.12-tomcat8.5/image @@ -1,9 +1,9 @@ -IMAGE alpine3.11-tomcat8.5_8.5.56-200621 -FROM alpine3.11-java8_8.242.08-200621 +IMAGE alpine3.12-tomcat8.5_8.5.59-201021 +FROM alpine3.12-java8_8.252.09-201021 RUN EOF # Install Tomcat 8.5 - wget https://archive.apache.org/dist/tomcat/tomcat-8/v8.5.56/bin/apache-tomcat-8.5.56.tar.gz -O - | tar xzf - -C /srv + wget https://archive.apache.org/dist/tomcat/tomcat-8/v8.5.59/bin/apache-tomcat-8.5.59.tar.gz -O - | tar xzf - -C /srv mv /srv/apache-tomcat-* /srv/tomcat # Make catalina.sh available globally diff --git a/lxc-shared/alpine3.11-tomcat8.5/image.d/srv/tomcat/bin/setenv.sh b/lxc-shared/alpine3.12-tomcat8.5/image.d/srv/tomcat/bin/setenv.sh similarity index 100% rename from lxc-shared/alpine3.11-tomcat8.5/image.d/srv/tomcat/bin/setenv.sh rename to lxc-shared/alpine3.12-tomcat8.5/image.d/srv/tomcat/bin/setenv.sh diff --git a/lxc-shared/alpine3.11-tomcat8.5/image.d/srv/tomcat/conf/logging.properties b/lxc-shared/alpine3.12-tomcat8.5/image.d/srv/tomcat/conf/logging.properties similarity index 100% rename from lxc-shared/alpine3.11-tomcat8.5/image.d/srv/tomcat/conf/logging.properties rename to lxc-shared/alpine3.12-tomcat8.5/image.d/srv/tomcat/conf/logging.properties diff --git a/lxc-shared/alpine3.12/image b/lxc-shared/alpine3.12/image index aa3ba2f..b90ef88 100644 --- a/lxc-shared/alpine3.12/image +++ b/lxc-shared/alpine3.12/image @@ -1,6 +1,6 @@ -IMAGE alpine3.12_3.12.0-201013 +IMAGE alpine3.12_3.12.1-201021 -COPY https://github.com/alpinelinux/docker-alpine/raw/v3.12/x86_64/alpine-minirootfs-3.12.0-x86_64.tar.gz +COPY https://github.com/alpinelinux/docker-alpine/raw/v3.12/x86_64/alpine-minirootfs-3.12.1-x86_64.tar.gz RUN EOF # Update packages