Merge branch 'master' into docker

Tag with current branch, instead of latest
2021-07-22 01:17:02 +02:00 · 2021-07-22 01:13:53 +02:00 · 2021-07-22 00:28:33 +02:00 · 2021-07-21 23:50:47 +02:00 · 2021-07-21 23:50:47 +02:00 · 2021-07-21 23:50:47 +02:00
1 changed files with 1 additions and 1 deletions
--- a/capsulflask/shell_scripts/get.sh
+++ b/capsulflask/shell_scripts/get.sh
@ -30,6 +30,6 @@ if virsh domuuid "$vmname" | grep -vqE '^[\t\s\n]*$'; then
 fi

 # this gets the ipv4
-ipv4="$(virsh domifaddr "$vmname" | awk '/ipv4/ {print $4}' | cut -d'/' -f1)"
+ipv4="$(virsh domifaddr "$vmname" | awk '/vnet/ {print $4}' | cut -d'/' -f1)"

 echo "$exists $state $ipv4"
Author	SHA1	Message	Date
3wordchant	abe768a521	Merge branch 'master' into docker Some checks failed continuous-integration/drone/push Build is passing Details continuous-integration/drone/pr Build is failing Details	2021-07-22 01:17:02 +02:00
3wordchant	18294cec43	Merge branch 'master' into docker Some checks failed continuous-integration/drone/pr Build is failing Details continuous-integration/drone/push Build is passing Details	2021-07-22 01:13:53 +02:00
3wc	982556a2c5	Tag with current branch, instead of `latest` Some checks reported errors continuous-integration/drone/pr Build was killed Details continuous-integration/drone/push Build is passing Details	2021-07-22 00:28:33 +02:00
3wc	13646e64da	Make docker-compose file less demanding Some checks failed continuous-integration/drone/pr Build is failing Details continuous-integration/drone/push Build is passing Details	2021-07-21 23:50:47 +02:00
3wc	67149f437a	Changes from @decentral1se code review	2021-07-21 23:50:47 +02:00
3wc	308ac05fe6	Add openssh-cient to Dockerfile for ssh-keyscan	2021-07-21 23:50:47 +02:00
3wc	c378c2b287	STRIPE_SECRET_KEY not STRIPE_PUBLISHABLE_KEY	2021-07-21 23:50:47 +02:00
3wc	5367822747	Load secrets from files if _FILE vars are set	2021-07-21 23:50:47 +02:00
3wc	e295b4420c	Docker updates for libvirtd	2021-07-21 23:50:47 +02:00
3wc	e4180b8306	Use Flask server in development	2021-07-21 23:50:47 +02:00
3wc	5cd5126039	Multi-stage build oh my!	2021-07-21 23:50:47 +02:00
3wc	f8e9ab2482	Initial attempt at Docker	2021-07-21 23:50:47 +02:00