Use preloaded containers from flash-drive during the installation

Signed-off-by: Ivan Kuznetsov <jsvapiav@gmail.com>
tiiuae · Sep 27, 2024 · 479d301 · 479d301
1 parent b4de098
commit 479d301
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 6 deletions.
diff --git a/hardware/fmo-os-rugged-laptop-7330.nix b/hardware/fmo-os-rugged-laptop-7330.nix
@@ -273,6 +273,10 @@
               preloaded-images = "tii-offline-map-data-loader.tar.gz";
               docker-url = "cr.airoplatform.com";
               docker-url-path = "/var/lib/fogdata/cr.url";
+
+              preloaded-list = "/var/lib/fogdata/preloaded/containers.list";
+              preloaded-path = "/var/lib/fogdata/preloaded/containers/";
+              preloaded-docker-compose = "/var/lib/fogdata/preloaded/docker-compose.yml";
             }; # services.fmo-dci
             avahi = {
               enable = true;

diff --git a/hardware/fmo-os-rugged-tablet-7230.nix b/hardware/fmo-os-rugged-tablet-7230.nix
@@ -253,6 +253,10 @@
               preloaded-images = "tii-offline-map-data-loader.tar.gz";
               docker-url = "cr.airoplatform.com";
               docker-url-path = "/var/lib/fogdata/cr.url";
+
+              preloaded-list = "/var/lib/fogdata/preloaded/containers.list";
+              preloaded-path = "/var/lib/fogdata/preloaded/containers/";
+              preloaded-docker-compose = "/var/lib/fogdata/preloaded/docker-compose.yml";
             }; # services.fmo-dci
             avahi = {
               enable = true;

diff --git a/modules/fmo-dci-service/default.nix b/modules/fmo-dci-service/default.nix
@@ -29,6 +29,18 @@ in {
       type = types.str;
       description = "Preloaded docker images file names separated by spaces";
     };
+    preloaded-list = mkOption {
+      type = types.str;
+      description = "Preloaded docker images container.list path";
+    };
+    preloaded-path = mkOption {
+      type = types.str;
+      description = "Preloaded docker images path";
+    };
+    preloaded-docker-compose = mkOption {
+      type = types.str;
+      description = "Preloaded docker-compose path";
+    };
     docker-url = mkOption {
       type = types.str;
       default = "";
@@ -55,7 +67,7 @@ in {
         DCPATH=$(echo ${cfg.compose-path})
         UPDPATH=$(echo ${cfg.update-path})
         BCPPATH=$(echo ${cfg.backup-path})
-        PRELOAD_PATH=$(echo ${preload_path})
+        PRELOAD_PATH=$(echo ${cfg.preloaded-path})
         DOCKER_URL=$(echo ${cfg.docker-url})
         DOCKER_URL_PATH=$(echo ${cfg.docker-url-path})
 
@@ -82,11 +94,16 @@ in {
             echo "Update file does not exist. No operations performed"
         fi
 
-        echo "Login $DOCKER_URL"
-        echo $PAT | ${pkgs.docker}/bin/docker login $DOCKER_URL -u $USR --password-stdin || echo "login to $DOCKER_URL failed continue as is"
+        # Check if the update file exists
+        if [ -e "$DCPATH" ]; then
+          echo "docker-compose exist -- skip"
+        else
+          cp ${cfg.preloaded-docker-compose} $DCPATH
+        fi
 
         echo "Load preloaded docker images"
-        for FNAME in ${cfg.preloaded-images}; do
+        IMGLIST=$(cat ${cfg.preloaded-list})
+        for FNAME in $IMGLIST; do
           IM_NAME=''${FNAME%%.*}
 
           if test -f "$PRELOAD_PATH/$FNAME"; then

diff --git a/modules/pterm-installer/default.nix b/modules/pterm-installer/default.nix
@@ -75,8 +75,8 @@ in
         name = "ghaf-installer";
         src = builtins.fetchGit {
           url = "https://github.com/tiiuae/FMO-OS-Installer.git";
-          rev = "a7db48bd46841b1c94babc80946626f4cc8416f7";
-          ref = "refs/heads/main";
+          rev = "1575fdfb9cfa39aba75e67bcdf3cb4989e7de11c";
+          ref = "refs/heads/mvp1";
         };
         vendorSha256 = "sha256-MKMsvIP8wMV86dh9Y5CWhgTQD0iRpzxk7+0diHkYBUo=";
         proxyVendor=true;