bob-l2: more fixes

Author: ilyaluk

bob-common/mkosi.extra/usr/bin/init-container.sh

@@ -21,15 +21,12 @@ su -s /bin/sh searcher -c "cd ~ && podman run -d \
     --name $NAME --replace \
     --init \
     -p ${SEARCHER_SSH_PORT}:22 \
-    -p ${ENGINE_API_PORT}:${ENGINE_API_PORT} \
     -p ${EL_P2P_PORT}:${EL_P2P_PORT} \
     -p ${EL_P2P_PORT}:${EL_P2P_PORT}/udp \
     -p ${SEARCHER_INPUT_CHANNEL}:${SEARCHER_INPUT_CHANNEL}/udp \
     -v /persistent/searcher:/persistent:rw \
     -v /etc/searcher/ssh_hostkey:/etc/searcher/ssh_hostkey:rw \
     -v /persistent/searcher_logs:/var/log/searcher:rw \
-    -v /persistent/lighthouse_logs:/var/log/lighthouse:ro \
-    -v /tmp/jwt.hex:/secrets/jwt.hex:ro \
     -v /etc/searcher-logrotate.conf:/tmp/searcher.conf:ro \
     $BOB_SEARCHER_EXTRA_PODMAN_FLAGS \
     docker.io/library/ubuntu:24.04 \

bob-l1/mkosi.extra/etc/bob/searcher-container-before-init

@@ -3,8 +3,8 @@
 
 ENGINE_API_PORT=8551
 
-BOB_SEARCHER_EXTRA_PODMAN_FLAGS="
+BOB_SEARCHER_EXTRA_PODMAN_FLAGS="\
     -p ${ENGINE_API_PORT}:${ENGINE_API_PORT} \
     -v /persistent/lighthouse_logs:/var/log/lighthouse:ro \
-    -v /tmp/jwt.hex:/secrets/jwt.hex:ro
+    -v /tmp/jwt.hex:/secrets/jwt.hex:ro \
 "

bob-l2/mkosi.extra/etc/bob/searcher-container-after-init

@@ -6,9 +6,3 @@ exec_in_container "
 $METADATA_BOB_L2_TX_STREAM_IP tx-stream.internal
 $METADATA_BOB_L2_BACKRUNS_IP  backruns.internal
 EOF"
-
-# Copy metadata into the container for transparency
-#
-# This might be implemented as bind read-only mount in the future,
-# but customizing container startup per bob-l2 is too complex for now
-cat /etc/metadata.env | exec_in_container "cat > /etc/metadata.env"

bob-l2/mkosi.extra/etc/bob/searcher-container-before-init

@@ -0,0 +1,9 @@
+# This script is sourced from init-container.sh and contains image-specific stuff
+# See also: bob-common/mkosi.extra/usr/bin/init-container.sh
+
+ENGINE_API_PORT=8651
+
+BOB_SEARCHER_EXTRA_PODMAN_FLAGS="\
+    -p ${ENGINE_API_PORT}:${ENGINE_API_PORT} \
+    -v /etc/metadata.env:/etc/metadata.env:ro \
+"

bob-l2/mkosi.extra/usr/bin/fetch-metadata.sh

@@ -12,11 +12,15 @@ if dmidecode -s system-manufacturer 2>/dev/null | grep -q "QEMU"; then
     echo "Running in local QEMU, using hardcoded metadata values"
 
     cat <<EOF >> /etc/metadata.env
-BOB_L2_BACKRUNS_IP='1.1.1.1'
-BOB_L2_TX_STREAM_IP='1.0.0.1'
-BOB_L2_OP_NODE_CIDR='10.0.0.0/8'
+METADATA_BOB_L2_BACKRUNS_IP='1.1.1.1'
+METADATA_BOB_L2_TX_STREAM_IP='1.0.0.1'
+METADATA_BOB_L2_OP_NODE_CIDR='10.0.0.0/8'
 EOF
 
+    # Ideally, this logic should be somewhere else, but it's fine for now
+    chattr -i /etc/resolv.conf || true
+    echo "nameserver 1.1.1.1" > /etc/resolv.conf
+
     exit 0
 fi