feat: tag in config

Author: Threated

justfile

@@ -5,7 +5,7 @@ CONFIG_PATH := canonicalize(env("BRIDGEHEAD_CONFIG_PATH", "./bridgehead"))
 export TAG := env("TAG", "localbuild")
 
 run: build ensure_bootstrap
-  sudo TAG=$TAG {{ CONFIG_PATH }}/bridgehead install
+  sudo {{ CONFIG_PATH }}/bridgehead install
 
 up: down_bg run
   {{ CONFIG_PATH }}/bridgehead compose up

src/config.rs

@@ -24,6 +24,8 @@ pub struct Config {
     pub hostname: Host,
     #[serde(default)]
     pub environment: Environment,
+    #[serde(default = "latest")]
+    pub version_tag: String,
     pub https_proxy_url: Option<Url>,
     pub ccp: Option<CcpConfig>,
     pub bbmri: Option<BbmriConfig>,
@@ -34,6 +36,10 @@ pub struct Config {
     pub local_conf: RefCell<LocalConf>,
 }
 
+fn latest() -> String {
+    "latest".to_string()
+}
+
 #[derive(Debug, Deserialize, Default)]
 #[serde(rename_all = "lowercase")]
 pub enum Environment {

static/bootstrap.sh

@@ -28,6 +28,7 @@ EOF
     read -p "Proxy [${HTTPS_PROXY:-None}]: " proxy
     proxy="${proxy:-$HTTPS_PROXY}"
     [ -n "$proxy" ] && echo "proxy = \"$proxy\"" >> "${config_dir}/config.toml"
+    [ -n "$TAG" ] && echo "version_tag = \"$TAG\"" >> "${config_dir}/config.toml"
 
     echo "Configuration file created at ${config_dir}/config.toml"
 else

templates/bridgehead

@@ -29,7 +29,7 @@ main() {
             {%- endif %}
             if ! systemctl list-units &> /dev/null; then
                 echo "Systemd is not active. Skipping systemd setup."
-                sudo -u bridgehead TAG=$TAG ./bridgehead update
+                sudo -u bridgehead ./bridgehead update
             else
                 install_systemd
             fi
@@ -69,14 +69,13 @@ main() {
         update)
             docker image prune -f
             # TODO: Check if the bridgehead script changed and if so rerun
-            # TODO: Read tag from config
-            docker pull samply/rusthead:${TAG:-latest} &>/dev/null || echo "Failed to pull latest rusthead image. Using latest local image."
+            docker pull samply/rusthead:{{ conf.version_tag }} &>/dev/null || echo "Failed to pull latest rusthead image. Using latest local image."
             docker run --rm \
                 -v {{ config_dir }}:{{ config_dir }} \
                 -v /var/run/docker.sock:/var/run/docker.sock \
                 -e BRIDGEHEAD_CONFIG_PATH={{ config_dir }} \
                 -u "$(id -u bridgehead):$(id -g bridgehead)" \
-                samply/rusthead:${TAG:-latest} update
+                samply/rusthead:{{ conf.version_tag }} update
             ;;
         *)
             echo "Unknown bridgehead command '$@'"

tests/snapshots/example.config/configs@bridgehead.snap

@@ -30,7 +30,7 @@ main() {
             git config --local user.name "Bridgehead"
             if ! systemctl list-units &> /dev/null; then
                 echo "Systemd is not active. Skipping systemd setup."
-                sudo -u bridgehead TAG=$TAG ./bridgehead update
+                sudo -u bridgehead ./bridgehead update
             else
                 install_systemd
             fi
@@ -61,14 +61,13 @@ main() {
         update)
             docker image prune -f
             # TODO: Check if the bridgehead script changed and if so rerun
-            # TODO: Read tag from config
-            docker pull samply/rusthead:${TAG:-latest} &>/dev/null || echo "Failed to pull latest rusthead image. Using latest local image."
+            docker pull samply/rusthead:latest &>/dev/null || echo "Failed to pull latest rusthead image. Using latest local image."
             docker run --rm \
                 -v [TMP_DIR]:[TMP_DIR] \
                 -v /var/run/docker.sock:/var/run/docker.sock \
                 -e BRIDGEHEAD_CONFIG_PATH=[TMP_DIR] \
                 -u "$(id -u bridgehead):$(id -g bridgehead)" \
-                samply/rusthead:${TAG:-latest} update
+                samply/rusthead:latest update
             ;;
         *)
             echo "Unknown bridgehead command '$@'"

tests/snapshots/minimal/configs@bridgehead.snap

@@ -30,7 +30,7 @@ main() {
             git config --local user.name "Bridgehead"
             if ! systemctl list-units &> /dev/null; then
                 echo "Systemd is not active. Skipping systemd setup."
-                sudo -u bridgehead TAG=$TAG ./bridgehead update
+                sudo -u bridgehead ./bridgehead update
             else
                 install_systemd
             fi
@@ -48,14 +48,13 @@ main() {
         update)
             docker image prune -f
             # TODO: Check if the bridgehead script changed and if so rerun
-            # TODO: Read tag from config
-            docker pull samply/rusthead:${TAG:-latest} &>/dev/null || echo "Failed to pull latest rusthead image. Using latest local image."
+            docker pull samply/rusthead:latest &>/dev/null || echo "Failed to pull latest rusthead image. Using latest local image."
             docker run --rm \
                 -v [TMP_DIR]:[TMP_DIR] \
                 -v /var/run/docker.sock:/var/run/docker.sock \
                 -e BRIDGEHEAD_CONFIG_PATH=[TMP_DIR] \
                 -u "$(id -u bridgehead):$(id -g bridgehead)" \
-                samply/rusthead:${TAG:-latest} update
+                samply/rusthead:latest update
             ;;
         *)
             echo "Unknown bridgehead command '$@'"