Update autoinstall

autoinstall.yaml

@@ -34,8 +34,6 @@ autoinstall:
     - build-essential
     - composer
     - dnsutils
-    - docker-compose
-    - docker.io
     - firefox
     - fonts-powerline
     - gimp
@@ -72,39 +70,48 @@ autoinstall:
 
   late-commands:
     # Resize 100GB partition to full space available
-    - curtin in-target -- lvextend -l +100%FREE /dev/ubuntu-vg/ubuntu-lv
-    - curtin in-target -- resize2fs /dev/mapper/ubuntu--vg-ubuntu--lv
+    - curtin in-target --target=/target -- lvextend -l +100%FREE /dev/ubuntu-vg/ubuntu-lv
+    - curtin in-target --target=/target -- resize2fs /dev/mapper/ubuntu--vg-ubuntu--lv
 
     # Install Brave
-    - curtin in-target -- wget -qO- https://dl.brave.com/install.sh | sh
+    - curtin in-target --target=/target -- wget -qO- https://dl.brave.com/install.sh | sh
 
     # Installing Warp
-    - curtin in-target -- /bin/bash -c "wget --content-disposition -O /tmp/warp.deb 'https://app.warp.dev/download?package=deb' && dpkg -i /tmp/warp.deb"
+    - curtin in-target --target=/target -- /bin/bash -c "wget --content-disposition -O /tmp/warp.deb 'https://app.warp.dev/download?package=deb' && dpkg -i /tmp/warp.deb"
 
     # Raise inotify watches limit
-    - curtin in-target -- sh -c 'echo "fs.inotify.max_user_watches=524288" >> /etc/sysctl.conf'
-    - curtin in-target -- sh -c 'echo "fs.inotify.max_user_instances=512" >> /etc/sysctl.conf'
-    - curtin in-target -- sh -c 'sysctl -p'
+    - curtin in-target --target=/target -- sh -c 'echo "fs.inotify.max_user_watches=524288" >> /etc/sysctl.conf'
+    - curtin in-target --target=/target -- sh -c 'echo "fs.inotify.max_user_instances=512" >> /etc/sysctl.conf'
+    - curtin in-target --target=/target -- sh -c 'sysctl -p'
 
     # Installing 1password-cli
-    - curtin in-target -- wget -O /tmp/1password.asc https://downloads.1password.com/linux/keys/1password.asc
-    - curtin in-target -- gpg --dearmor --output /usr/share/keyrings/1password-archive-keyring.gpg /tmp/1password.asc
-    - curtin in-target -- echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/1password-archive-keyring.gpg] https://downloads.1password.com/linux/debian/$(dpkg --print-architecture) stable main" | tee /etc/apt/sources.list.d/1password.list
-    - curtin in-target -- mkdir -p /etc/debsig/policies/AC2D62742012EA22/
-    - curtin in-target -- wget -O /etc/debsig/policies/AC2D62742012EA22/1password.pol https://downloads.1password.com/linux/debian/debsig/1password.pol
-    - curtin in-target -- mkdir -p /usr/share/debsig/keyrings/AC2D62742012EA22
-    - curtin in-target -- wget -O /tmp/debsig.gpg https://downloads.1password.com/linux/keys/1password.asc
-    - curtin in-target -- gpg --dearmor --output /usr/share/debsig/keyrings/AC2D62742012EA22/debsig.gpg /tmp/debsig.gpg
-    - curtin in-target -- apt update
-    - curtin in-target -- apt install -y 1password 1password-cli
-
+    - curtin in-target --target=/target -- bash -c '
+      curl -sS https://downloads.1password.com/linux/keys/1password.asc |
+      gpg --dearmor --output /usr/share/keyrings/1password-archive-keyring.gpg &&
+      echo "deb [arch=amd64 signed-by=/usr/share/keyrings/1password-archive-keyring.gpg] https://downloads.1password.com/linux/debian/amd64 stable main" |
+      tee /etc/apt/sources.list.d/1password.list &&
+      apt update &&
+      apt install -y 1password'
+
+    # Install docker and docker compose plugin
+    - curtin in-target --target=/target -- bash -c '
+      apt update &&
+      apt install -y ca-certificates curl &&
+      install -m 0755 -d /etc/apt/keyrings &&
+      curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc &&
+      chmod a+r /etc/apt/keyrings/docker.asc &&
+      echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu $(. /etc/os-release && echo ${UBUNTU_CODENAME:-$VERSION_CODENAME}) stable" |
+      tee /etc/apt/sources.list.d/docker.list > /dev/null &&
+      apt update &&
+      apt install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin'
+
     # Install oh-my-zsh
-    - curtin in-target -- sh -c "$(wget -qO- https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
+    - curtin in-target --target=/target -- sh -c "$(wget -qO- https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
 
     # Install nvm
-    - curtin in-target -- wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.1/install.sh | bash
+    - curtin in-target --target=/target -- wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.1/install.sh | bash
 
     # Installing Gnome extensions
-    #- curtin in-target -- gnome-extensions enable [email protected]
-    #- curtin in-target -- gnome-extensions enable [email protected]
-    #- curtin in-target -- gnome-extensions enable [email protected]
+    #- curtin in-target --target=/target -- gnome-extensions enable [email protected]
+    #- curtin in-target --target=/target -- gnome-extensions enable [email protected]
+    #- curtin in-target --target=/target -- gnome-extensions enable [email protected]