fix bubble unit and revert alloy

.env.example

@@ -29,7 +29,3 @@ HOMELAB_TLD=ice
 HOMELAB_ZONE=cloud
 ADVERTISE_ROUTE=10.1.0.0/24
 TSDNS_SUBNET=10.1.0.0/24
-
-# /etc/conf.d/alloy.template
-LOKI_URL=
-LOKI_TENANT=

image/build-image.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 IMAGE_NAME="${IMAGE_NAME:=alpine-vm}"
-IMAGE_SIZE="${IMAGE_SIZE:-1G}"
+IMAGE_SIZE="${IMAGE_SIZE:-512M}"
 IMAGE_FORMAT="${IMAGE_FORMAT:=raw}"
 ALPINE_BRANCH="${ALPINE_BRANCH:=latest-stable}"
 KERNEL_FLAVOR="${KERNEL_FLAVOR:=virt}"
@@ -31,7 +31,7 @@ alpine-make-vm-image \
 	--fs-skel-dir    "$OVERLAY_DIR" \
 	--fs-skel-chown  root:root \
 	--script-chroot \
-	--packages       "nftables curl docker openssh alloy" \
+	--packages       "nftables curl docker openssh" \
 	"$IMAGE_FILE" \
 	"$CONFIGURE_SH" | tee $TMP
 

image/configure.sh

@@ -36,9 +36,6 @@ rc-update add sshd
 rc-update add auth-server
 rc-update add bubble
 
-mv /etc/conf.d/alloy.template /etc/conf.d/alloy
-rc-update add alloy
-
 step 'Adjust syslog'
 sed -i 's/^SYSLOGD_OPTS="\(.*\)"/SYSLOGD_OPTS="\1 -K"/' /etc/conf.d/syslog
 grep "SYSLOGD_OPTS" /etc/conf.d/syslog

image/overlay/etc/conf.d/alloy.template

@@ -1,10 +0,0 @@
-# Configuration for /etc/init.d/alloy
-
-STORAGE=/data/alloy
-export ENVIRONMENT=prod
-export LOKI_URL=_LOKI_URL_
-export LOKI_TENANT=_LOKI_TENANT_
-export NODE_NAME=$(cat /etc/hostname)
-
-# Comment out to disable process supervisor.
-supervisor=supervise-daemon

image/overlay/etc/init.d/bubble

@@ -5,7 +5,10 @@ depend() {
 }
 
 start_pre() {
-  docker pull git.sfclub.cc/cloud/workspace-image:latest
+	 until docker info >/dev/null 2>&1; do
+		  sleep 2
+	 done
+    docker pull git.sfclub.cc/cloud/workspace-image:latest
 }
 
 command="/usr/bin/bubble"