Merge branch 'partition-framework-placeholder' of github.com:getumbrel/umbrel-os into partition-framework-placeholder

stage2/04-docker-compose/00-packages

@@ -1 +0,0 @@
-docker.io

stage2/04-install-docker/00-run.sh

@@ -0,0 +1,13 @@
+#!/bin/bash -e
+echo "Installing Docker"
+on_chroot << EOF
+export CURL_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt
+curl -fsSL https://get.docker.com | sh
+EOF
+
+echo "Adding user to the 'docker' group"
+echo "Also fixing permissions on folders"
+on_chroot << EOF
+usermod -a -G docker $FIRST_USER_NAME
+chown -R $FIRST_USER_NAME:$FIRST_USER_NAME /home/$FIRST_USER_NAME
+EOF

stage2/05-docker-compose/00-packages

@@ -0,0 +1 @@
+git

stage2/04-docker-compose/01-run.sh → stage2/05-docker-compose/01-run.sh

@@ -1,5 +1,6 @@
-# Install docker via pip3 (within chroot)
+#!/bin/bash -e
 
+# Install docker via pip3 (within chroot)
 echo "Installing docker-compose from pip3, and also setting up the box folder structure"
 
 on_chroot << EOF

stage2/06-fix-docker-perms/01-run.sh

@@ -1,7 +0,0 @@
-echo "Adding lncm to DOCKER group"
-echo "Also fixing permissions on folders"
-on_chroot << EOF
-usermod -a -G docker $FIRST_USER_NAME
-chown -R $FIRST_USER_NAME:$FIRST_USER_NAME /home/$FIRST_USER_NAME
-EOF
-