From 2bd45fea0ded92182589c5ff3c7e0bb66c9d077d Mon Sep 17 00:00:00 2001 From: Disassembler Date: Wed, 18 Dec 2019 10:13:32 +0100 Subject: [PATCH] Fix a few build omissions --- apk/vmmgr | 2 +- build/clean-all.sh | 1 + build/install-toolchain.sh | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/apk/vmmgr b/apk/vmmgr index e05ffc1..bfd1b7c 160000 --- a/apk/vmmgr +++ b/apk/vmmgr @@ -1 +1 @@ -Subproject commit e05ffc194f95e9078d0bf8e9a1d2494b4a1ba3ca +Subproject commit bfd1b7cb2f4b87e7987b66a8c47069e2e06c74db diff --git a/build/clean-all.sh b/build/clean-all.sh index 2918709..6edf1d7 100755 --- a/build/clean-all.sh +++ b/build/clean-all.sh @@ -27,6 +27,7 @@ rc-update -u # Remove containers rm -rf /var/lib/lxc/* +rm -f /var/log/lxc/* # Remove application data for DIR in $(find /srv ! -path /srv/build -maxdepth 1 -mindepth 1); do diff --git a/build/install-toolchain.sh b/build/install-toolchain.sh index 2e4390f..5877d29 100755 --- a/build/install-toolchain.sh +++ b/build/install-toolchain.sh @@ -27,7 +27,7 @@ cp usr/bin/lxcmerge /usr/bin/lxcmerge mkdir -p /srv/build/lxc/apps /srv/build/lxc/images # Prepare local APK repository -cp etc/nginx/conf.d/apkrepo.conf /etc/nginx/conf.d/apkrepo.conf +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