From 04804d8883b50e1b6329353bf15e25800f6ea91e Mon Sep 17 00:00:00 2001
From: Disassembler <disassembler@dasm.cz>
Date: Fri, 13 Mar 2020 17:36:50 +0100
Subject: [PATCH] Build fixes

---
 build/build-all.sh                            | 20 ++++++++-----------
 lxc-services/mariadb/{lxcfile => image}       |  0
 lxc-services/postgis/image                    |  2 +-
 .../image.d/etc/apk/keys/vm.rsa.pub           |  0
 vm/etc/apk/keys/vm.rsa.pub                    |  9 +++++++++
 5 files changed, 18 insertions(+), 13 deletions(-)
 rename lxc-services/mariadb/{lxcfile => image} (100%)
 rename vm/etc/apk/keys/repokey.rsa.pub => lxc-shared/alpine3.11/image.d/etc/apk/keys/vm.rsa.pub (100%)
 create mode 100644 vm/etc/apk/keys/vm.rsa.pub

diff --git a/build/build-all.sh b/build/build-all.sh
index fb3e1fc..1ade7ad 100755
--- a/build/build-all.sh
+++ b/build/build-all.sh
@@ -24,7 +24,7 @@ cd ${ROOT}/apk/proj4
 abuild -F
 
 cd ${ROOT}/apk/rabbitmq-server
-apk add -U elixir erlang-compiler erlang-dev erlang-edoc erlang-eldap erlang-erl-docgen erlang-mnesia erlang-os-mon erlang-runtime-tools erlang-tools erlang-xmerl gawk grep libxslt py2-simplejson python2 rsync socat xmlto zip
+apk add -U elixir erlang-compiler erlang-dev erlang-edoc erlang-eldap erlang-erl-docgen erlang-mnesia erlang-os-mon erlang-runtime-tools erlang-tools erlang-eunit erlang-xmerl gawk grep libxslt py3-simplejson python3 rsync socat xmlto zip
 abuild -F
 
 cd ${ROOT}/apk/postgis
@@ -39,19 +39,15 @@ cd ${ROOT}/lxc-shared
 spoc-image build -p alpine3.8/image
 spoc-image build -p alpine3.8-php5.6/image
 spoc-image build -p alpine3.8-ruby2.4/image
-spoc-image build -p alpine3.9/image
-spoc-image build -p alpine3.9-java8/image
-spoc-image build -p alpine3.9-php7.2/image
-spoc-image build -p alpine3.9-python2.7/image
-spoc-image build -p alpine3.9-python3.6/image
-spoc-image build -p alpine3.9-ruby2.4/image
-spoc-image build -p alpine3.9-ruby2.6/image
-spoc-image build -p alpine3.9-tomcat7/image
-spoc-image build -p alpine3.9-tomcat8.5/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
 
 # Build services
 cd ${ROOT}/lxc-services
@@ -66,8 +62,8 @@ spoc-image build -p solr6/image
 # Build applications
 cd ${ROOT}/lxc-apps
 
-spoc-image build -p ckan/image
-spoc-image build -p ckan-datapusher/image
+spoc-image build -p ckan/ckan.image
+spoc-image build -p ckan/ckan-datapusher.image
 spoc-app publish ckan/app
 
 spoc-image build -p crisiscleanup/image
diff --git a/lxc-services/mariadb/lxcfile b/lxc-services/mariadb/image
similarity index 100%
rename from lxc-services/mariadb/lxcfile
rename to lxc-services/mariadb/image
diff --git a/lxc-services/postgis/image b/lxc-services/postgis/image
index 6a96ae2..ec02203 100644
--- a/lxc-services/postgis/image
+++ b/lxc-services/postgis/image
@@ -1,5 +1,5 @@
 IMAGE postgis_3.0.0-200313
-FROM postgres_12.1.0-200313
+FROM postgres_12.2.0-200313
 
 USER root
 
diff --git a/vm/etc/apk/keys/repokey.rsa.pub b/lxc-shared/alpine3.11/image.d/etc/apk/keys/vm.rsa.pub
similarity index 100%
rename from vm/etc/apk/keys/repokey.rsa.pub
rename to lxc-shared/alpine3.11/image.d/etc/apk/keys/vm.rsa.pub
diff --git a/vm/etc/apk/keys/vm.rsa.pub b/vm/etc/apk/keys/vm.rsa.pub
new file mode 100644
index 0000000..81c90a8
--- /dev/null
+++ b/vm/etc/apk/keys/vm.rsa.pub
@@ -0,0 +1,9 @@
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqoNig96JdNCBGE60FMKN
+9mD8DrcDIIwl06r+lTnQuLfNxEYxLCS06zlGVQ5o7bJBOZumMZNWdINpa5j8378/
+M6ieDxmd4YErcLobNnYlubp1qVljVcK8luPtvVrQ4O+Ss9owO97qJHKsXF1U2jgE
+29QkIGPj+5IfkkbTeGP5T1o9ySmu6AQ+yjGi+ohUtnF5cR+cPb1cJR2XhirS0yLN
+E+9E7tcTfILIgxGfCshwdSrZ67fknPZmB+8QpWypd0rlG4lf4kjrY/pZ0Jlu2JxX
+BjdgUB4rzcNk99UZfkp2BbGtNYjZ4PZukOl8AYX14bdDSja2W6TcLnGfCqHZRCjW
+HwIDAQAB
+-----END PUBLIC KEY-----