From 29cad671dc3f28f49edeb66106327050aaf471c4 Mon Sep 17 00:00:00 2001 From: Disassembler Date: Fri, 13 Mar 2020 17:03:03 +0100 Subject: [PATCH] Mass bump shared and service images to Alpine 3.11 --- lxc-services/activemq/{lxcfile => image} | 10 +++++----- .../srv/activemq/conf/activemq.xml | 0 lxc-services/mariadb/lxcfile | 10 +++++----- lxc-services/postgis/image | 7 ++++--- lxc-services/postgres/image | 12 ++++++++---- lxc-services/rabbitmq/{lxcfile => image} | 10 +++++----- lxc-services/redis/{lxcfile => image} | 6 +++--- lxc-services/solr6/lxcfile | 6 +++--- lxc-shared/alpine3.11-java8/image | 6 ++++++ lxc-shared/alpine3.11-php7.3/image | 6 +++--- lxc-shared/alpine3.11-python2.7/image | 6 +++--- lxc-shared/alpine3.11-python3.8/image | 6 +++--- .../lxcfile => alpine3.11-ruby2.4/image} | 6 +++--- .../lxcfile => alpine3.11-ruby2.6/image} | 6 +++--- .../lxcfile => alpine3.11-tomcat7/image} | 12 ++++++------ .../image.d}/srv/tomcat/bin/setenv.sh | 0 .../image.d}/srv/tomcat/conf/logging.properties | 0 .../lxcfile => alpine3.11-tomcat8.5/image} | 12 ++++++------ .../image.d}/srv/tomcat/bin/setenv.sh | 0 .../image.d}/srv/tomcat/conf/logging.properties | 0 lxc-shared/alpine3.11/image | 4 +++- .../alpine3.11/image.d/etc/apk/repositories | 3 +++ lxc-shared/alpine3.8-php5.6/lxcfile | 2 +- lxc-shared/alpine3.9-java8/lxcfile | 7 ------- lxc-shared/alpine3.9-python2.7/lxcfile | 8 -------- lxc-shared/alpine3.9-python3.6/lxcfile | 9 --------- .../alpine3.9/lxc/etc/apk/keys/repokey.rsa.pub | 9 --------- lxc-shared/alpine3.9/lxc/etc/apk/repositories | 3 --- lxc-shared/alpine3.9/lxcfile | 15 --------------- 29 files changed, 73 insertions(+), 108 deletions(-) rename lxc-services/activemq/{lxcfile => image} (62%) rename lxc-services/activemq/{lxc => image.d}/srv/activemq/conf/activemq.xml (100%) rename lxc-services/rabbitmq/{lxcfile => image} (67%) rename lxc-services/redis/{lxcfile => image} (76%) create mode 100644 lxc-shared/alpine3.11-java8/image rename lxc-shared/{alpine3.9-ruby2.4/lxcfile => alpine3.11-ruby2.4/image} (86%) rename lxc-shared/{alpine3.9-ruby2.6/lxcfile => alpine3.11-ruby2.6/image} (86%) rename lxc-shared/{alpine3.9-tomcat7/lxcfile => alpine3.11-tomcat7/image} (65%) rename lxc-shared/{alpine3.9-tomcat7/lxc => alpine3.11-tomcat7/image.d}/srv/tomcat/bin/setenv.sh (100%) rename lxc-shared/{alpine3.9-tomcat7/lxc => alpine3.11-tomcat7/image.d}/srv/tomcat/conf/logging.properties (100%) rename lxc-shared/{alpine3.9-tomcat8.5/lxcfile => alpine3.11-tomcat8.5/image} (71%) rename lxc-shared/{alpine3.9-tomcat8.5/lxc => alpine3.11-tomcat8.5/image.d}/srv/tomcat/bin/setenv.sh (100%) rename lxc-shared/{alpine3.9-tomcat8.5/lxc => alpine3.11-tomcat8.5/image.d}/srv/tomcat/conf/logging.properties (100%) create mode 100644 lxc-shared/alpine3.11/image.d/etc/apk/repositories delete mode 100644 lxc-shared/alpine3.9-java8/lxcfile delete mode 100644 lxc-shared/alpine3.9-python2.7/lxcfile delete mode 100644 lxc-shared/alpine3.9-python3.6/lxcfile delete mode 100644 lxc-shared/alpine3.9/lxc/etc/apk/keys/repokey.rsa.pub delete mode 100644 lxc-shared/alpine3.9/lxc/etc/apk/repositories delete mode 100644 lxc-shared/alpine3.9/lxcfile diff --git a/lxc-services/activemq/lxcfile b/lxc-services/activemq/image similarity index 62% rename from lxc-services/activemq/lxcfile rename to lxc-services/activemq/image index 717c741..d94011e 100644 --- a/lxc-services/activemq/lxcfile +++ b/lxc-services/activemq/image @@ -1,9 +1,9 @@ -IMAGE activemq_5.15.9-190620 -FROM alpine3.9-java8_8.212.04-190620 +IMAGE activemq_5.15.9-200313 +FROM alpine3.11-java8_8.242.08-200313 RUN EOF # Download and install ActiveMQ - wget http://archive.apache.org/dist/activemq/5.15.9/apache-activemq-5.15.9-bin.tar.gz -O - | tar xzf - -C /srv + wget https://archive.apache.org/dist/activemq/5.15.9/apache-activemq-5.15.9-bin.tar.gz -O - | tar xzf - -C /srv mv /srv/apache-activemq-5.15.9 /srv/activemq # Create OS user @@ -13,7 +13,7 @@ RUN EOF chown activemq:activemq /srv/activemq/tmp EOF -COPY lxc +COPY image.d -USER 61616 61616 +USER activemq CMD /srv/activemq/bin/activemq console diff --git a/lxc-services/activemq/lxc/srv/activemq/conf/activemq.xml b/lxc-services/activemq/image.d/srv/activemq/conf/activemq.xml similarity index 100% rename from lxc-services/activemq/lxc/srv/activemq/conf/activemq.xml rename to lxc-services/activemq/image.d/srv/activemq/conf/activemq.xml diff --git a/lxc-services/mariadb/lxcfile b/lxc-services/mariadb/lxcfile index cbeccd8..5aec0ad 100644 --- a/lxc-services/mariadb/lxcfile +++ b/lxc-services/mariadb/lxcfile @@ -1,5 +1,5 @@ -IMAGE mariadb_10.3.15-190620 -FROM alpine3.9_3.9.4-190620 +IMAGE mariadb_10.4.12-200313 +FROM alpine3.11_3.11.3-200313 RUN EOF # Create OS user (which will be picked up later by apk add) @@ -14,7 +14,7 @@ RUN EOF chown mysql:mysql /run/mysqld EOF -USER 3306 3306 -CMD mysqld -READY test -e /run/mysqld/mysqld.sock +USER mysql +CMD /usr/bin/mysqld +READY /usr/bin/test -e /run/mysqld/mysqld.sock HALT SIGTERM diff --git a/lxc-services/postgis/image b/lxc-services/postgis/image index 3666fac..6a96ae2 100644 --- a/lxc-services/postgis/image +++ b/lxc-services/postgis/image @@ -1,5 +1,5 @@ -IMAGE postgis_3.0.0-200207 -FROM postgres_12.1.0-200207 +IMAGE postgis_3.0.0-200313 +FROM postgres_12.1.0-200313 USER root @@ -9,4 +9,5 @@ RUN EOF EOF USER postgres -CMD postgres -D /var/lib/postgresql +CMD /usr/bin/postgres -D /var/lib/postgresql +READY /usr/bin/pg_isready diff --git a/lxc-services/postgres/image b/lxc-services/postgres/image index 94baa67..cb7d760 100644 --- a/lxc-services/postgres/image +++ b/lxc-services/postgres/image @@ -1,7 +1,11 @@ -IMAGE postgres_12.1.0-200207 -FROM alpine3.11_3.11.3-200207 +IMAGE postgres_12.2.0-200313 +FROM alpine3.11_3.11.3-200313 RUN EOF + # Create OS user (which will be picked up later by apk add) + addgroup -S -g 5432 postgres + adduser -S -u 5432 -h /var/lib/postgresql -s /bin/false -g postgres -G postgres postgres + # Install PostgreSQL apk --no-cache add postgresql postgresql-contrib @@ -11,5 +15,5 @@ RUN EOF EOF USER postgres -CMD postgres -D /var/lib/postgresql -READY pg_isready +CMD /usr/bin/postgres -D /var/lib/postgresql +READY /usr/bin/pg_isready diff --git a/lxc-services/rabbitmq/lxcfile b/lxc-services/rabbitmq/image similarity index 67% rename from lxc-services/rabbitmq/lxcfile rename to lxc-services/rabbitmq/image index e8002c4..a01a64f 100644 --- a/lxc-services/rabbitmq/lxcfile +++ b/lxc-services/rabbitmq/image @@ -1,5 +1,5 @@ -IMAGE rabbitmq_3.7.11-190620 -FROM alpine3.9_3.9.4-190620 +IMAGE rabbitmq_3.7.18-200313 +FROM alpine3.11_3.11.3-200313 RUN EOF # Create OS user (which will be picked up later by apk add) @@ -10,7 +10,7 @@ RUN EOF apk --no-cache add rabbitmq-server@vm EOF -USER 5672 5672 +USER rabbitmq ENV HOME /usr/lib/rabbitmq -CMD rabbitmq-server -READY rabbitmqctl await_startup +CMD /usr/sbin/rabbitmq-server +READY /usr/sbin/rabbitmqctl await_startup diff --git a/lxc-services/redis/lxcfile b/lxc-services/redis/image similarity index 76% rename from lxc-services/redis/lxcfile rename to lxc-services/redis/image index 2d70ce2..0c49d58 100644 --- a/lxc-services/redis/lxcfile +++ b/lxc-services/redis/image @@ -1,5 +1,5 @@ IMAGE redis_4.0.12-190620 -FROM alpine3.9_3.9.4-190620 +FROM alpine3.11_3.11.3-200313 RUN EOF # Create OS user (which will be picked up later by apk add) @@ -10,5 +10,5 @@ RUN EOF apk --no-cache add redis EOF -USER 6379 6379 -CMD redis-server /etc/redis.conf +USER redis +CMD /usr/bin/redis-server /etc/redis.conf diff --git a/lxc-services/solr6/lxcfile b/lxc-services/solr6/lxcfile index 8f797d6..783e741 100644 --- a/lxc-services/solr6/lxcfile +++ b/lxc-services/solr6/lxcfile @@ -1,5 +1,5 @@ -IMAGE solr6_6.5.1-190620 -FROM alpine3.9-java8_8.212.04-190620 +IMAGE solr6_6.5.1-200313 +FROM alpine3.11-java8_8.242.08-200313 RUN EOF # Install runtime dependencies @@ -20,6 +20,6 @@ EOF COPY lxc -USER 8983 8983 +USER solr CMD /usr/bin/solr start -f READY /bin/grep -q "o.e.j.s.Server Started" /opt/solr/server/logs/solr.log diff --git a/lxc-shared/alpine3.11-java8/image b/lxc-shared/alpine3.11-java8/image new file mode 100644 index 0000000..0aed130 --- /dev/null +++ b/lxc-shared/alpine3.11-java8/image @@ -0,0 +1,6 @@ +IMAGE alpine3.11-java8_8.242.08-200313 +FROM alpine3.11_3.11.3-200313 + +RUN EOF + apk --no-cache add openjdk8-jre-base +EOF diff --git a/lxc-shared/alpine3.11-php7.3/image b/lxc-shared/alpine3.11-php7.3/image index 3702490..d284d78 100644 --- a/lxc-shared/alpine3.11-php7.3/image +++ b/lxc-shared/alpine3.11-php7.3/image @@ -1,8 +1,8 @@ -IMAGE alpine3.11-php7.3_7.3.14-200207 -FROM alpine3.11_3.11.3-200207 +IMAGE alpine3.11-php7.3_7.3.15-200313 +FROM alpine3.11_3.11.3-200313 RUN EOF apk --no-cache add nginx php7 php7-ctype php7-fpm php7-gd php7-json php7-mbstring php7-mcrypt php7-opcache php7-session EOF -CMD php -a +CMD /usr/bin/php -a diff --git a/lxc-shared/alpine3.11-python2.7/image b/lxc-shared/alpine3.11-python2.7/image index b2d90ee..c2b3cc9 100644 --- a/lxc-shared/alpine3.11-python2.7/image +++ b/lxc-shared/alpine3.11-python2.7/image @@ -1,8 +1,8 @@ -IMAGE alpine3.11-python2.7_2.7.16-200207 -FROM alpine3.11_3.11.3-200207 +IMAGE alpine3.11-python2.7_2.7.16-200313 +FROM alpine3.11_3.11.3-200313 RUN EOF apk --no-cache add python2 EOF -CMD python +CMD /usr/bin/python diff --git a/lxc-shared/alpine3.11-python3.8/image b/lxc-shared/alpine3.11-python3.8/image index a1b6c8e..b11448f 100644 --- a/lxc-shared/alpine3.11-python3.8/image +++ b/lxc-shared/alpine3.11-python3.8/image @@ -1,9 +1,9 @@ -IMAGE alpine3.11-python3.8_3.8.1-200207 -FROM alpine3.11_3.11.3-200207 +IMAGE alpine3.11-python3.8_3.8.2-200313 +FROM alpine3.11_3.11.3-200313 RUN EOF apk --no-cache add python3 ln -s /usr/bin/python3 /usr/bin/python EOF -CMD python +CMD /usr/bin/python diff --git a/lxc-shared/alpine3.9-ruby2.4/lxcfile b/lxc-shared/alpine3.11-ruby2.4/image similarity index 86% rename from lxc-shared/alpine3.9-ruby2.4/lxcfile rename to lxc-shared/alpine3.11-ruby2.4/image index e466e16..ea8c8b5 100644 --- a/lxc-shared/alpine3.9-ruby2.4/lxcfile +++ b/lxc-shared/alpine3.11-ruby2.4/image @@ -1,5 +1,5 @@ -IMAGE alpine3.9-ruby2.4_2.4.5-190620 -FROM alpine3.9_3.9.4-190620 +IMAGE alpine3.11-ruby2.4_2.4.9-200313 +FROM alpine3.11_3.11.3-200313 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.5.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.9.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.9-ruby2.6/lxcfile b/lxc-shared/alpine3.11-ruby2.6/image similarity index 86% rename from lxc-shared/alpine3.9-ruby2.6/lxcfile rename to lxc-shared/alpine3.11-ruby2.6/image index b1309a1..a57c629 100644 --- a/lxc-shared/alpine3.9-ruby2.6/lxcfile +++ b/lxc-shared/alpine3.11-ruby2.6/image @@ -1,5 +1,5 @@ -IMAGE alpine3.9-ruby2.6_2.6.3-190620 -FROM alpine3.9_3.9.4-190620 +IMAGE alpine3.11-ruby2.6_2.6.5-200313 +FROM alpine3.11_3.11.3-200313 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.6/ruby-2.6.3.tar.xz -O - | tar xJf - -C /usr/src/ruby --strip-components=1 + wget http://cache.ruby-lang.org/pub/ruby/2.6/ruby-2.6.5.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.9-tomcat7/lxcfile b/lxc-shared/alpine3.11-tomcat7/image similarity index 65% rename from lxc-shared/alpine3.9-tomcat7/lxcfile rename to lxc-shared/alpine3.11-tomcat7/image index fc9aa98..f2168c5 100644 --- a/lxc-shared/alpine3.9-tomcat7/lxcfile +++ b/lxc-shared/alpine3.11-tomcat7/image @@ -1,10 +1,10 @@ -IMAGE alpine3.9-tomcat7_7.0.94-190620 -FROM alpine3.9-java8_8.212.04-190620 +IMAGE alpine3.11-tomcat7_7.0.99-200313 +FROM alpine3.11-java8_8.242.08-200313 RUN EOF # Install Tomcat 7 - wget https://archive.apache.org/dist/tomcat/tomcat-7/v7.0.94/bin/apache-tomcat-7.0.94.tar.gz -O - | tar xzf - -C /srv - mv /srv/apache-tomcat-7.0.94 /srv/tomcat + wget https://archive.apache.org/dist/tomcat/tomcat-7/v7.0.99/bin/apache-tomcat-7.0.99.tar.gz -O - | tar xzf - -C /srv + mv /srv/apache-tomcat-7.0.99 /srv/tomcat # Make catalina.sh available globally ln -s /srv/tomcat/bin/catalina.sh /usr/bin/catalina.sh @@ -15,7 +15,7 @@ RUN EOF rm -rf /srv/tomcat/webapps/* EOF -COPY lxc +COPY image.d RUN EOF # Create OS user @@ -24,4 +24,4 @@ RUN EOF chown -R tomcat:tomcat /srv/tomcat/conf /srv/tomcat/logs /srv/tomcat/temp /srv/tomcat/webapps /srv/tomcat/work EOF -CMD catalina.sh run +CMD /usr/bin/catalina.sh run diff --git a/lxc-shared/alpine3.9-tomcat7/lxc/srv/tomcat/bin/setenv.sh b/lxc-shared/alpine3.11-tomcat7/image.d/srv/tomcat/bin/setenv.sh similarity index 100% rename from lxc-shared/alpine3.9-tomcat7/lxc/srv/tomcat/bin/setenv.sh rename to lxc-shared/alpine3.11-tomcat7/image.d/srv/tomcat/bin/setenv.sh diff --git a/lxc-shared/alpine3.9-tomcat7/lxc/srv/tomcat/conf/logging.properties b/lxc-shared/alpine3.11-tomcat7/image.d/srv/tomcat/conf/logging.properties similarity index 100% rename from lxc-shared/alpine3.9-tomcat7/lxc/srv/tomcat/conf/logging.properties rename to lxc-shared/alpine3.11-tomcat7/image.d/srv/tomcat/conf/logging.properties diff --git a/lxc-shared/alpine3.9-tomcat8.5/lxcfile b/lxc-shared/alpine3.11-tomcat8.5/image similarity index 71% rename from lxc-shared/alpine3.9-tomcat8.5/lxcfile rename to lxc-shared/alpine3.11-tomcat8.5/image index 37f7203..ccda668 100644 --- a/lxc-shared/alpine3.9-tomcat8.5/lxcfile +++ b/lxc-shared/alpine3.11-tomcat8.5/image @@ -1,10 +1,10 @@ -IMAGE alpine3.9-tomcat8.5_8.5.41-190620 -FROM alpine3.9-java8_8.212.04-190620 +IMAGE alpine3.11-tomcat8.5_8.5.51-200313 +FROM alpine3.11-java8_8.242.08-200313 RUN EOF # Install Tomcat 8.5 - wget https://archive.apache.org/dist/tomcat/tomcat-8/v8.5.41/bin/apache-tomcat-8.5.41.tar.gz -O - | tar xzf - -C /srv - mv /srv/apache-tomcat-8.5.41 /srv/tomcat + wget https://archive.apache.org/dist/tomcat/tomcat-8/v8.5.51/bin/apache-tomcat-8.5.51.tar.gz -O - | tar xzf - -C /srv + mv /srv/apache-tomcat-8.5.51 /srv/tomcat # Make catalina.sh available globally ln -s /srv/tomcat/bin/catalina.sh /usr/bin/catalina.sh @@ -20,7 +20,7 @@ RUN EOF chmod 755 /srv/tomcat/bin/*.sh EOF -COPY lxc +COPY image.d RUN EOF # Create OS user @@ -29,4 +29,4 @@ RUN EOF chown -R tomcat:tomcat /srv/tomcat/conf /srv/tomcat/logs /srv/tomcat/temp /srv/tomcat/webapps /srv/tomcat/work EOF -CMD catalina.sh run +CMD /usr/bin/catalina.sh run diff --git a/lxc-shared/alpine3.9-tomcat8.5/lxc/srv/tomcat/bin/setenv.sh b/lxc-shared/alpine3.11-tomcat8.5/image.d/srv/tomcat/bin/setenv.sh similarity index 100% rename from lxc-shared/alpine3.9-tomcat8.5/lxc/srv/tomcat/bin/setenv.sh rename to lxc-shared/alpine3.11-tomcat8.5/image.d/srv/tomcat/bin/setenv.sh diff --git a/lxc-shared/alpine3.9-tomcat8.5/lxc/srv/tomcat/conf/logging.properties b/lxc-shared/alpine3.11-tomcat8.5/image.d/srv/tomcat/conf/logging.properties similarity index 100% rename from lxc-shared/alpine3.9-tomcat8.5/lxc/srv/tomcat/conf/logging.properties rename to lxc-shared/alpine3.11-tomcat8.5/image.d/srv/tomcat/conf/logging.properties diff --git a/lxc-shared/alpine3.11/image b/lxc-shared/alpine3.11/image index 1ee04aa..30ace46 100644 --- a/lxc-shared/alpine3.11/image +++ b/lxc-shared/alpine3.11/image @@ -1,4 +1,4 @@ -IMAGE alpine3.11_3.11.3-200207 +IMAGE alpine3.11_3.11.3-200313 COPY https://github.com/alpinelinux/docker-alpine/raw/v3.11/x86_64/alpine-minirootfs-3.11.3-x86_64.tar.gz @@ -12,3 +12,5 @@ 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/repositories b/lxc-shared/alpine3.11/image.d/etc/apk/repositories new file mode 100644 index 0000000..a99e30b --- /dev/null +++ b/lxc-shared/alpine3.11/image.d/etc/apk/repositories @@ -0,0 +1,3 @@ +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-php5.6/lxcfile b/lxc-shared/alpine3.8-php5.6/lxcfile index 340a927..7a260ea 100644 --- a/lxc-shared/alpine3.8-php5.6/lxcfile +++ b/lxc-shared/alpine3.8-php5.6/lxcfile @@ -6,4 +6,4 @@ RUN EOF ln -s /usr/bin/php5 /usr/bin/php EOF -CMD php -a +CMD /usr/bin/php -a diff --git a/lxc-shared/alpine3.9-java8/lxcfile b/lxc-shared/alpine3.9-java8/lxcfile deleted file mode 100644 index 01a0f8b..0000000 --- a/lxc-shared/alpine3.9-java8/lxcfile +++ /dev/null @@ -1,7 +0,0 @@ -IMAGE alpine3.9-java8_8.212.04-190620 -FROM alpine3.9_3.9.4-190620 - -RUN EOF - # nss needed due to https://github.com/docker-library/openjdk/issues/289 , https://bugs.alpinelinux.org/issues/10126 - apk --no-cache add nss openjdk8-jre-base -EOF diff --git a/lxc-shared/alpine3.9-python2.7/lxcfile b/lxc-shared/alpine3.9-python2.7/lxcfile deleted file mode 100644 index 247782f..0000000 --- a/lxc-shared/alpine3.9-python2.7/lxcfile +++ /dev/null @@ -1,8 +0,0 @@ -IMAGE alpine3.9-python2.7_2.7.16-190620 -FROM alpine3.9_3.9.4-190620 - -RUN EOF - apk --no-cache add python2 -EOF - -CMD python diff --git a/lxc-shared/alpine3.9-python3.6/lxcfile b/lxc-shared/alpine3.9-python3.6/lxcfile deleted file mode 100644 index 6e4f217..0000000 --- a/lxc-shared/alpine3.9-python3.6/lxcfile +++ /dev/null @@ -1,9 +0,0 @@ -IMAGE alpine3.9-python3.6_3.6.8-190620 -FROM alpine3.9_3.9.4-190620 - -RUN EOF - apk --no-cache add python3 - ln -s /usr/bin/python3 /usr/bin/python -EOF - -CMD python diff --git a/lxc-shared/alpine3.9/lxc/etc/apk/keys/repokey.rsa.pub b/lxc-shared/alpine3.9/lxc/etc/apk/keys/repokey.rsa.pub deleted file mode 100644 index 81c90a8..0000000 --- a/lxc-shared/alpine3.9/lxc/etc/apk/keys/repokey.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.9/lxc/etc/apk/repositories b/lxc-shared/alpine3.9/lxc/etc/apk/repositories deleted file mode 100644 index dc3c8d3..0000000 --- a/lxc-shared/alpine3.9/lxc/etc/apk/repositories +++ /dev/null @@ -1,3 +0,0 @@ -http://dl-cdn.alpinelinux.org/alpine/v3.9/main -http://dl-cdn.alpinelinux.org/alpine/v3.9/community -@vm http://repo.build.vm/alpine/v3.9/apk diff --git a/lxc-shared/alpine3.9/lxcfile b/lxc-shared/alpine3.9/lxcfile deleted file mode 100644 index 6f3a04c..0000000 --- a/lxc-shared/alpine3.9/lxcfile +++ /dev/null @@ -1,15 +0,0 @@ -IMAGE alpine3.9_3.9.4-190620 - -COPY https://github.com/gliderlabs/docker-alpine/raw/rootfs/library-3.9/x86_64/versions/library-3.9/x86_64/rootfs.tar.xz -COPY lxc - -RUN EOF - # Update packages - apk --no-cache upgrade - - # Install common packages - apk --no-cache add libbz2 libgcc libressl libstdc++ libxml2 libxslt ncurses-libs pcre readline s6 xz-libs - - # Cleanup - rm -rf /etc/crontabs/root /etc/periodic -EOF