Spotter-Cluster/Spotter-VM
2
0
Fork 0
Code Issues 78 Pull Requests Actions Packages Projects Releases Wiki Activity

Mass bump shared and service images to Alpine 3.11

Browse Source
This commit is contained in:
Disassembler 2020-03-13 17:03:03 +01:00
parent 705ac8104a
commit 29cad671dc
No known key found for this signature in database
GPG Key ID: 524BD33A0EE29499
29 changed files with 73 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lxc-services/activemq/lxcfile → lxc-services/activemq/image
View File

@ -1,9 +1,9 @@
IMAGE activemq_5.15.9-190620 IMAGE activemq_5.15.9-200313
FROM alpine3.9-java8_8.212.04-190620 FROM alpine3.11-java8_8.242.08-200313
RUN EOF RUN EOF
# Download and install ActiveMQ # 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 mv /srv/apache-activemq-5.15.9 /srv/activemq
# Create OS user # Create OS user
@ -13,7 +13,7 @@ RUN EOF
chown activemq:activemq /srv/activemq/tmp chown activemq:activemq /srv/activemq/tmp
EOF EOF
COPY lxc COPY image.d
USER 61616 61616 USER activemq
CMD /srv/activemq/bin/activemq console CMD /srv/activemq/bin/activemq console

0
lxc-services/activemq/lxc/srv/activemq/conf/activemq.xml → lxc-services/activemq/image.d/srv/activemq/conf/activemq.xml
View File

10
lxc-services/mariadb/lxcfile
View File

@ -1,5 +1,5 @@
IMAGE mariadb_10.3.15-190620 IMAGE mariadb_10.4.12-200313
FROM alpine3.9_3.9.4-190620 FROM alpine3.11_3.11.3-200313
RUN EOF RUN EOF
# Create OS user (which will be picked up later by apk add) # Create OS user (which will be picked up later by apk add)
@ -14,7 +14,7 @@ RUN EOF
chown mysql:mysql /run/mysqld chown mysql:mysql /run/mysqld
EOF EOF
USER 3306 3306 USER mysql
CMD mysqld CMD /usr/bin/mysqld
READY test -e /run/mysqld/mysqld.sock READY /usr/bin/test -e /run/mysqld/mysqld.sock
HALT SIGTERM HALT SIGTERM

7
lxc-services/postgis/image
View File

@ -1,5 +1,5 @@
IMAGE postgis_3.0.0-200207 IMAGE postgis_3.0.0-200313
FROM postgres_12.1.0-200207 FROM postgres_12.1.0-200313
USER root USER root
@ -9,4 +9,5 @@ RUN EOF
EOF EOF
USER postgres USER postgres
CMD postgres -D /var/lib/postgresql CMD /usr/bin/postgres -D /var/lib/postgresql
READY /usr/bin/pg_isready

12
lxc-services/postgres/image
View File

@ -1,7 +1,11 @@
IMAGE postgres_12.1.0-200207 IMAGE postgres_12.2.0-200313
FROM alpine3.11_3.11.3-200207 FROM alpine3.11_3.11.3-200313
RUN EOF 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 # Install PostgreSQL
apk --no-cache add postgresql postgresql-contrib apk --no-cache add postgresql postgresql-contrib
@ -11,5 +15,5 @@ RUN EOF
EOF EOF
USER postgres USER postgres
CMD postgres -D /var/lib/postgresql CMD /usr/bin/postgres -D /var/lib/postgresql
READY pg_isready READY /usr/bin/pg_isready

10
lxc-services/rabbitmq/lxcfile → lxc-services/rabbitmq/image
View File

@ -1,5 +1,5 @@
IMAGE rabbitmq_3.7.11-190620 IMAGE rabbitmq_3.7.18-200313
FROM alpine3.9_3.9.4-190620 FROM alpine3.11_3.11.3-200313
RUN EOF RUN EOF
# Create OS user (which will be picked up later by apk add) # 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 apk --no-cache add rabbitmq-server@vm
EOF EOF
USER 5672 5672 USER rabbitmq
ENV HOME /usr/lib/rabbitmq ENV HOME /usr/lib/rabbitmq
CMD rabbitmq-server CMD /usr/sbin/rabbitmq-server
READY rabbitmqctl await_startup READY /usr/sbin/rabbitmqctl await_startup

6
lxc-services/redis/lxcfile → lxc-services/redis/image
View File

@ -1,5 +1,5 @@
IMAGE redis_4.0.12-190620 IMAGE redis_4.0.12-190620
FROM alpine3.9_3.9.4-190620 FROM alpine3.11_3.11.3-200313
RUN EOF RUN EOF
# Create OS user (which will be picked up later by apk add) # Create OS user (which will be picked up later by apk add)
@ -10,5 +10,5 @@ RUN EOF
apk --no-cache add redis apk --no-cache add redis
EOF EOF
USER 6379 6379 USER redis
CMD redis-server /etc/redis.conf CMD /usr/bin/redis-server /etc/redis.conf

6
lxc-services/solr6/lxcfile
View File

@ -1,5 +1,5 @@
IMAGE solr6_6.5.1-190620 IMAGE solr6_6.5.1-200313
FROM alpine3.9-java8_8.212.04-190620 FROM alpine3.11-java8_8.242.08-200313
RUN EOF RUN EOF
# Install runtime dependencies # Install runtime dependencies
@ -20,6 +20,6 @@ EOF
COPY lxc COPY lxc
USER 8983 8983 USER solr
CMD /usr/bin/solr start -f CMD /usr/bin/solr start -f
READY /bin/grep -q "o.e.j.s.Server Started" /opt/solr/server/logs/solr.log READY /bin/grep -q "o.e.j.s.Server Started" /opt/solr/server/logs/solr.log

6
lxc-shared/alpine3.11-java8/image Normal file
View File

@ -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

6
lxc-shared/alpine3.11-php7.3/image
View File

@ -1,8 +1,8 @@
IMAGE alpine3.11-php7.3_7.3.14-200207 IMAGE alpine3.11-php7.3_7.3.15-200313
FROM alpine3.11_3.11.3-200207 FROM alpine3.11_3.11.3-200313
RUN EOF RUN EOF
apk --no-cache add nginx php7 php7-ctype php7-fpm php7-gd php7-json php7-mbstring php7-mcrypt php7-opcache php7-session apk --no-cache add nginx php7 php7-ctype php7-fpm php7-gd php7-json php7-mbstring php7-mcrypt php7-opcache php7-session
EOF EOF
CMD php -a CMD /usr/bin/php -a

6
lxc-shared/alpine3.11-python2.7/image
View File

@ -1,8 +1,8 @@
IMAGE alpine3.11-python2.7_2.7.16-200207 IMAGE alpine3.11-python2.7_2.7.16-200313
FROM alpine3.11_3.11.3-200207 FROM alpine3.11_3.11.3-200313
RUN EOF RUN EOF
apk --no-cache add python2 apk --no-cache add python2
EOF EOF
CMD python CMD /usr/bin/python

6
lxc-shared/alpine3.11-python3.8/image
View File

@ -1,9 +1,9 @@
IMAGE alpine3.11-python3.8_3.8.1-200207 IMAGE alpine3.11-python3.8_3.8.2-200313
FROM alpine3.11_3.11.3-200207 FROM alpine3.11_3.11.3-200313
RUN EOF RUN EOF
apk --no-cache add python3 apk --no-cache add python3
ln -s /usr/bin/python3 /usr/bin/python ln -s /usr/bin/python3 /usr/bin/python
EOF EOF
CMD python CMD /usr/bin/python

6
lxc-shared/alpine3.9-ruby2.4/lxcfile → lxc-shared/alpine3.11-ruby2.4/image
View File

@ -1,5 +1,5 @@
IMAGE alpine3.9-ruby2.4_2.4.5-190620 IMAGE alpine3.11-ruby2.4_2.4.9-200313
FROM alpine3.9_3.9.4-190620 FROM alpine3.11_3.11.3-200313
RUN EOF RUN EOF
# Install Ruby runtime dependencies # Install Ruby runtime dependencies
@ -10,7 +10,7 @@ RUN EOF
# Download and unpack Ruby # Download and unpack Ruby
mkdir -p /usr/src/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 # Compile and install Ruby
cd /usr/src/ruby cd /usr/src/ruby

6
lxc-shared/alpine3.9-ruby2.6/lxcfile → lxc-shared/alpine3.11-ruby2.6/image
View File

@ -1,5 +1,5 @@
IMAGE alpine3.9-ruby2.6_2.6.3-190620 IMAGE alpine3.11-ruby2.6_2.6.5-200313
FROM alpine3.9_3.9.4-190620 FROM alpine3.11_3.11.3-200313
RUN EOF RUN EOF
# Install Ruby runtime dependencies # Install Ruby runtime dependencies
@ -10,7 +10,7 @@ RUN EOF
# Download and unpack Ruby # Download and unpack Ruby
mkdir -p /usr/src/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 # Compile and install Ruby
cd /usr/src/ruby cd /usr/src/ruby

12
lxc-shared/alpine3.9-tomcat7/lxcfile → lxc-shared/alpine3.11-tomcat7/image
View File

@ -1,10 +1,10 @@
IMAGE alpine3.9-tomcat7_7.0.94-190620 IMAGE alpine3.11-tomcat7_7.0.99-200313
FROM alpine3.9-java8_8.212.04-190620 FROM alpine3.11-java8_8.242.08-200313
RUN EOF RUN EOF
# Install Tomcat 7 # 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 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.94 /srv/tomcat mv /srv/apache-tomcat-7.0.99 /srv/tomcat
# Make catalina.sh available globally # Make catalina.sh available globally
ln -s /srv/tomcat/bin/catalina.sh /usr/bin/catalina.sh ln -s /srv/tomcat/bin/catalina.sh /usr/bin/catalina.sh
@ -15,7 +15,7 @@ RUN EOF
rm -rf /srv/tomcat/webapps/* rm -rf /srv/tomcat/webapps/*
EOF EOF
COPY lxc COPY image.d
RUN EOF RUN EOF
# Create OS user # 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 chown -R tomcat:tomcat /srv/tomcat/conf /srv/tomcat/logs /srv/tomcat/temp /srv/tomcat/webapps /srv/tomcat/work
EOF EOF
CMD catalina.sh run CMD /usr/bin/catalina.sh run

0
lxc-shared/alpine3.9-tomcat7/lxc/srv/tomcat/bin/setenv.sh → lxc-shared/alpine3.11-tomcat7/image.d/srv/tomcat/bin/setenv.sh
View File

0
lxc-shared/alpine3.9-tomcat7/lxc/srv/tomcat/conf/logging.properties → lxc-shared/alpine3.11-tomcat7/image.d/srv/tomcat/conf/logging.properties
View File

12
lxc-shared/alpine3.9-tomcat8.5/lxcfile → lxc-shared/alpine3.11-tomcat8.5/image
View File

@ -1,10 +1,10 @@
IMAGE alpine3.9-tomcat8.5_8.5.41-190620 IMAGE alpine3.11-tomcat8.5_8.5.51-200313
FROM alpine3.9-java8_8.212.04-190620 FROM alpine3.11-java8_8.242.08-200313
RUN EOF RUN EOF
# Install Tomcat 8.5 # 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 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.41 /srv/tomcat mv /srv/apache-tomcat-8.5.51 /srv/tomcat
# Make catalina.sh available globally # Make catalina.sh available globally
ln -s /srv/tomcat/bin/catalina.sh /usr/bin/catalina.sh ln -s /srv/tomcat/bin/catalina.sh /usr/bin/catalina.sh
@ -20,7 +20,7 @@ RUN EOF
chmod 755 /srv/tomcat/bin/*.sh chmod 755 /srv/tomcat/bin/*.sh
EOF EOF
COPY lxc COPY image.d
RUN EOF RUN EOF
# Create OS user # 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 chown -R tomcat:tomcat /srv/tomcat/conf /srv/tomcat/logs /srv/tomcat/temp /srv/tomcat/webapps /srv/tomcat/work
EOF EOF
CMD catalina.sh run CMD /usr/bin/catalina.sh run

0
lxc-shared/alpine3.9-tomcat8.5/lxc/srv/tomcat/bin/setenv.sh → lxc-shared/alpine3.11-tomcat8.5/image.d/srv/tomcat/bin/setenv.sh
View File

0
lxc-shared/alpine3.9-tomcat8.5/lxc/srv/tomcat/conf/logging.properties → lxc-shared/alpine3.11-tomcat8.5/image.d/srv/tomcat/conf/logging.properties
View File

4
lxc-shared/alpine3.11/image
View File

@ -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 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 # Cleanup
rm -rf /etc/crontabs/root /etc/periodic rm -rf /etc/crontabs/root /etc/periodic
EOF EOF
COPY image.d

3
lxc-shared/alpine3.11/image.d/etc/apk/repositories Normal file
View File

@ -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

2
lxc-shared/alpine3.8-php5.6/lxcfile
View File

@ -6,4 +6,4 @@ RUN EOF
ln -s /usr/bin/php5 /usr/bin/php ln -s /usr/bin/php5 /usr/bin/php
EOF EOF
CMD php -a CMD /usr/bin/php -a

7
lxc-shared/alpine3.9-java8/lxcfile
View File

@ -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

8
lxc-shared/alpine3.9-python2.7/lxcfile
View File

@ -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

9
lxc-shared/alpine3.9-python3.6/lxcfile
View File

@ -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

9
lxc-shared/alpine3.9/lxc/etc/apk/keys/repokey.rsa.pub
View File

@ -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-----

3
lxc-shared/alpine3.9/lxc/etc/apk/repositories
View File

@ -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

15
lxc-shared/alpine3.9/lxcfile
View File

@ -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