blueprints.git

commit 22ea43c857c8e6d17ec0598d41bed74f8c8f2777

Author: Adam Evyčędo <git@apiote.xyz>

asgard with embedded templates

 asgard/Dockerfile | 3 ++-
 asgard/build.sh | 14 ++++++--------


diff --git a/asgard/Dockerfile b/asgard/Dockerfile
index d48ef6776f462249aa22493fd71d5c8bad838b13..ec4e8b822edf97df1c42404293f00577719746cd 100644
--- a/asgard/Dockerfile
+++ b/asgard/Dockerfile
@@ -1,5 +1,6 @@
 FROM alpine
-RUN apk add git plan9port tar xz go openssh-client
+RUN apk add git plan9port go openssh-client
+RUN ln -s /usr/lib/plan9/bin/mk /usr/local/bin/mk
 WORKDIR /root
 RUN mkdir .ssh
 COPY ssh_key .ssh/id_ed25519




diff --git a/asgard/build.sh b/asgard/build.sh
index aeb6317a0865959ba4cffc73e314c0134c6c21c7..3a129182a35172f224dd58b1104089e4917a2bbc 100755
--- a/asgard/build.sh
+++ b/asgard/build.sh
@@ -6,14 +6,12 @@ item="$1"
 
 git clone https://git.apiote.xyz/git/asgard.git
 cd asgard
-go build
-tar cf asgard.txz templates/ asgard
+mk
 commit=$(git show --pretty=oneline --abbrev-commit --name-only | head -n1 | cut -d ' ' -f 1)
 timestamp=$(date '+%Y%m%dT%H%M')
-scp asgard.txz deploy@host.containers.internal:toys/asgard/${item}/asgard_${timestamp}_${commit}.txz
-ssh deploy@host.containers.internal "cp ~/toys/asgard/${item}/asgard_${timestamp}_${commit}.txz /tmp/asgard.txz"
-ssh deploy@host.containers.internal "chmod a+rwX /tmp/asgard.txz"
-ssh deploy@host.containers.internal "doas -u www cp /tmp/asgard.txz /var/www/asgard"
-ssh deploy@host.containers.internal "rm /tmp/asgard.txz"
-ssh deploy@host.containers.internal "doas -u www tar xavf /var/www/asgard/asgard.txz -C /var/www/asgard/"
+scp asgard deploy@host.containers.internal:toys/asgard/${item}/asgard_${timestamp}_${commit}
+ssh deploy@host.containers.internal "cp ~/toys/asgard/${item}/asgard_${timestamp}_${commit} /tmp/asgard"
+ssh deploy@host.containers.internal "chmod a+rwX /tmp/asgard"
+ssh deploy@host.containers.internal "doas cp /tmp/asgard /usr/bin/asgard"
+ssh deploy@host.containers.internal "rm /tmp/asgard"
 ssh deploy@host.containers.internal "doas -u www doas /etc/init.d/asgard restart"