From e39aa41c7cf86517f3f1ec2f19630e8a41027f1e Mon Sep 17 00:00:00 2001
From: Disassembler <disassembler@dasm.cz>
Date: Thu, 22 Oct 2020 20:53:40 +0200
Subject: [PATCH] Bump service images to Alpine 3.12

---
 build/build-all.sh          | 15 +++++++--------
 lxc-services/activemq/image |  8 ++++----
 lxc-services/mariadb/image  |  4 ++--
 lxc-services/postgis/image  |  4 ++--
 lxc-services/postgres/image |  4 ++--
 lxc-services/rabbitmq/image |  4 ++--
 lxc-services/redis/image    |  4 ++--
 lxc-services/solr6/image    |  4 ++--
 8 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/build/build-all.sh b/build/build-all.sh
index f4d0160..cd5fce6 100755
--- a/build/build-all.sh
+++ b/build/build-all.sh
@@ -29,17 +29,16 @@ spoc-image build -p alpine3.8-java8/image
 spoc-image build -p alpine3.8-ruby2.4/image
 spoc-image build -p alpine3.10/image
 spoc-image build -p alpine3.10-nodejs10/image
-spoc-image build -p alpine3.10-python2.7/image
 spoc-image build -p alpine3.11/image
-spoc-image build -p alpine3.11-java8/image
-spoc-image build -p alpine3.11-php7.3/image
 spoc-image build -p alpine3.11-python2.7/image
-spoc-image build -p alpine3.11-python3.8/image
-spoc-image build -p alpine3.11-ruby2.4/image
-spoc-image build -p alpine3.11-ruby2.6/image
-spoc-image build -p alpine3.11-tomcat7/image
-spoc-image build -p alpine3.11-tomcat8.5/image
 spoc-image build -p alpine3.12/image
+spoc-image build -p alpine3.12-java8/image
+spoc-image build -p alpine3.12-php7.3/image
+spoc-image build -p alpine3.12-python3.8/image
+spoc-image build -p alpine3.12-ruby2.4/image
+spoc-image build -p alpine3.12-ruby2.6/image
+spoc-image build -p alpine3.12-tomcat7/image
+spoc-image build -p alpine3.12-tomcat8.5/image
 
 # Build services
 cd ${ROOT}/lxc-services
diff --git a/lxc-services/activemq/image b/lxc-services/activemq/image
index 1d102a4..5124c6e 100644
--- a/lxc-services/activemq/image
+++ b/lxc-services/activemq/image
@@ -1,10 +1,10 @@
-IMAGE activemq_5.15.13-200621
-FROM alpine3.11-java8_8.242.08-200621
+IMAGE activemq_5.16.0-201021
+FROM alpine3.12-java8_8.252.09-201021
 
 RUN EOF
     # Download and install ActiveMQ
-    wget https://archive.apache.org/dist/activemq/5.15.13/apache-activemq-5.15.13-bin.tar.gz -O - | tar xzf - -C /srv
-    mv /srv/apache-activemq-5.15.13 /srv/activemq
+    wget https://archive.apache.org/dist/activemq/5.16.0/apache-activemq-5.16.0-bin.tar.gz -O - | tar xzf - -C /srv
+    mv /srv/apache-activemq-* /srv/activemq
 
     # Create OS user
     addgroup -S -g 61616 activemq
diff --git a/lxc-services/mariadb/image b/lxc-services/mariadb/image
index e9015d4..ff75ce0 100644
--- a/lxc-services/mariadb/image
+++ b/lxc-services/mariadb/image
@@ -1,5 +1,5 @@
-IMAGE mariadb_10.4.15-201013
-FROM alpine3.12_3.12.0-201013
+IMAGE mariadb_10.4.15-201021
+FROM alpine3.12_3.12.1-201021
 
 RUN EOF
     # Create OS user (which will be picked up later by apk add)
diff --git a/lxc-services/postgis/image b/lxc-services/postgis/image
index f03d1f5..611209b 100644
--- a/lxc-services/postgis/image
+++ b/lxc-services/postgis/image
@@ -1,5 +1,5 @@
-IMAGE postgis_3.0.1-201013
-FROM postgres_12.4.0-201013
+IMAGE postgis_3.0.1-201021
+FROM postgres_12.4.0-201021
 
 USER root
 
diff --git a/lxc-services/postgres/image b/lxc-services/postgres/image
index 982fa80..45ee5a4 100644
--- a/lxc-services/postgres/image
+++ b/lxc-services/postgres/image
@@ -1,5 +1,5 @@
-IMAGE postgres_12.4.0-201013
-FROM alpine3.12_3.12.0-201013
+IMAGE postgres_12.4.0-201021
+FROM alpine3.12_3.12.1-201021
 
 RUN EOF
     # Create OS user (which will be picked up later by apk add)
diff --git a/lxc-services/rabbitmq/image b/lxc-services/rabbitmq/image
index 1112cbb..3c6df8d 100644
--- a/lxc-services/rabbitmq/image
+++ b/lxc-services/rabbitmq/image
@@ -1,5 +1,5 @@
-IMAGE rabbitmq_3.8.9-201013
-FROM alpine3.12_3.12.0-201013
+IMAGE rabbitmq_3.8.9-201021
+FROM alpine3.12_3.12.1-201021
 
 RUN EOF
     # Install RabbitMQ runtime dependencies
diff --git a/lxc-services/redis/image b/lxc-services/redis/image
index 5df9ea3..ccaa514 100644
--- a/lxc-services/redis/image
+++ b/lxc-services/redis/image
@@ -1,5 +1,5 @@
-IMAGE redis_5.0.9-201013
-FROM alpine3.12_3.12.0-201013
+IMAGE redis_5.0.9-201021
+FROM alpine3.12_3.12.1-201021
 
 RUN EOF
     # Create OS user (which will be picked up later by apk add)
diff --git a/lxc-services/solr6/image b/lxc-services/solr6/image
index 454a28d..02e27ab 100644
--- a/lxc-services/solr6/image
+++ b/lxc-services/solr6/image
@@ -1,5 +1,5 @@
-IMAGE solr6_6.5.1-200621
-FROM alpine3.11-java8_8.242.08-200621
+IMAGE solr6_6.5.1-201021
+FROM alpine3.12-java8_8.252.09-201021
 
 RUN EOF
     # Install runtime dependencies