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

Build toolchain amendments

Browse Source
This commit is contained in:
Disassembler 2020-03-13 13:22:47 +01:00
parent fe0777eaf2
commit d73b0c381f
Signed by: Disassembler
GPG Key ID: 524BD33A0EE29499
4 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apk/spoc

@ -1 +1 @@
Subproject commit a936985df1f857850a6ae9a0083c3dc0146674e4 Subproject commit a6dd9ee3e44428b0d7e88b78cd94c4ade306714a

12
build/build-all.sh
View File

@ -34,14 +34,6 @@ abuild -F
cd ${ROOT}/apk/vmmgr cd ${ROOT}/apk/vmmgr
abuild -F 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 # Build runtimes
cd ${ROOT}/lxc-shared cd ${ROOT}/lxc-shared
spoc-image build -p alpine3.8/image 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-ruby2.6/image
spoc-image build -p alpine3.9-tomcat7/image spoc-image build -p alpine3.9-tomcat7/image
spoc-image build -p alpine3.9-tomcat8.5/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 # Build services
cd ${ROOT}/lxc-services cd ${ROOT}/lxc-services

2
build/etc/abuild.conf
View File

@ -23,7 +23,7 @@ REPODEST=/srv/build/alpine/v3.11
# the APKBUILD's "Contributor:" and "Maintainer:" comments, respectively. # the APKBUILD's "Contributor:" and "Maintainer:" comments, respectively.
#PACKAGER="Your Name <your@email.address>" #PACKAGER="Your Name <your@email.address>"
#MAINTAINER="$PACKAGER" #MAINTAINER="$PACKAGER"
PACKAGER_PRIVKEY="/srv/build/repokey.rsa" PACKAGER_PRIVKEY="/root/repokey.rsa"
# what to clean up after a successful build # what to clean up after a successful build
CLEANUP="srcdir bldroot pkgdir deps" CLEANUP="srcdir bldroot pkgdir deps"

8
build/install-toolchain.sh
View File

@ -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 echo "172.17.0.1 repo.build.vm" >>/etc/hosts
service nginx reload service nginx reload
# Change LXCMgr repository # Change SPOC repository
echo '{"url":"http://repo.build.vm/lxc","user":"","pwd":""}' >/etc/lxcmgr/repo.json sed -i 's/repo\.spotter\.cz/repo.build.vm/' /etc/spoc/spoc.conf
# Supply abuild key # 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 ecparam -genkey -name secp384r1 -out /etc/spoc/publish.key
# openssl ec -in /etc/spoc/publish.key -pubout -out /tmp/repository.pub # openssl ec -in /etc/spoc/publish.key -pubout -out /tmp/repository.pub