From d73b0c381f234c7ef5cb3bb1ddb87450c0cc47f9 Mon Sep 17 00:00:00 2001
From: Disassembler <disassembler@dasm.cz>
Date: Fri, 13 Mar 2020 13:22:47 +0100
Subject: [PATCH] Build toolchain amendments

---
 apk/spoc                   |  2 +-
 build/build-all.sh         | 12 ++++--------
 build/etc/abuild.conf      |  2 +-
 build/install-toolchain.sh |  8 ++++----
 4 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/apk/spoc b/apk/spoc
index a936985..a6dd9ee 160000
--- a/apk/spoc
+++ b/apk/spoc
@@ -1 +1 @@
-Subproject commit a936985df1f857850a6ae9a0083c3dc0146674e4
+Subproject commit a6dd9ee3e44428b0d7e88b78cd94c4ade306714a
diff --git a/build/build-all.sh b/build/build-all.sh
index 348f082..fb3e1fc 100755
--- a/build/build-all.sh
+++ b/build/build-all.sh
@@ -34,14 +34,6 @@ abuild -F
 cd ${ROOT}/apk/vmmgr
 abuild -F
 
-cd ${ROOT}/apk/wireguard
-apk add -U libmnl-dev linux-virt-dev linux-firmware-none
-FLAVOR=virt abuild -F
-
-cd ${ROOT}/apk/wireguard-tools
-apk add -U libmnl-dev
-abuild -F
-
 # Build runtimes
 cd ${ROOT}/lxc-shared
 spoc-image build -p alpine3.8/image
@@ -56,6 +48,10 @@ 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-php7.3/image
+spoc-image build -p alpine3.11-python2.7/image
+spoc-image build -p alpine3.11-python3.8/image
 
 # Build services
 cd ${ROOT}/lxc-services
diff --git a/build/etc/abuild.conf b/build/etc/abuild.conf
index 51d8f4e..66f1cd5 100644
--- a/build/etc/abuild.conf
+++ b/build/etc/abuild.conf
@@ -23,7 +23,7 @@ REPODEST=/srv/build/alpine/v3.11
 # the APKBUILD's "Contributor:" and "Maintainer:" comments, respectively.
 #PACKAGER="Your Name <your@email.address>"
 #MAINTAINER="$PACKAGER"
-PACKAGER_PRIVKEY="/srv/build/repokey.rsa"
+PACKAGER_PRIVKEY="/root/repokey.rsa"
 
 # what to clean up after a successful build
 CLEANUP="srcdir bldroot pkgdir deps"
diff --git a/build/install-toolchain.sh b/build/install-toolchain.sh
index 576790a..cc73d71 100755
--- a/build/install-toolchain.sh
+++ b/build/install-toolchain.sh
@@ -26,12 +26,12 @@ cp etc/nginx/conf.d/repo.conf /etc/nginx/conf.d/repo.conf
 echo "172.17.0.1 repo.build.vm" >>/etc/hosts
 service nginx reload
 
-# Change LXCMgr repository
-echo '{"url":"http://repo.build.vm/lxc","user":"","pwd":""}' >/etc/lxcmgr/repo.json
+# Change SPOC repository
+sed -i 's/repo\.spotter\.cz/repo.build.vm/' /etc/spoc/spoc.conf
 
 # Supply abuild key
-# echo '/srv/build/repokey.rsa' | abuild-keygen
+# echo '/root/repokey.rsa' | abuild-keygen
 
-# Supply LXC build key
+# Supply SPOC key
 # openssl ecparam -genkey -name secp384r1 -out /etc/spoc/publish.key
 # openssl ec -in /etc/spoc/publish.key -pubout -out /tmp/repository.pub