Merge branch 'master' into develop

.github/workflows/release.yml

@@ -134,7 +134,7 @@ jobs:
 
   publish-release:
     runs-on: ubuntu-latest
-    needs: [create-tag]
+    needs: [create-tag, build-images, build-worker, build-cli]
     outputs:
       id: ${{ steps.create_release.outputs.id }}
     steps:

docker-compose.dev.yml

@@ -60,7 +60,6 @@ services:
       context: .
       dockerfile: ./packages/worker/Dockerfile.dev
     container_name: tipi-worker
-    user: root
     healthcheck:
       test: ['CMD', 'curl', '-f', 'http://localhost:3000/healthcheck']
       interval: 5s
@@ -80,7 +79,6 @@ services:
       # Dev mode
       - ${PWD}/packages/worker/src:/app/packages/worker/src
       # Production mode
-      - /:/host/root:ro
       - /proc:/host/proc:ro
       - /var/run/docker.sock:/var/run/docker.sock
       - ${PWD}/.env:/app/.env

docker-compose.prod.yml

@@ -76,7 +76,6 @@ services:
     environment:
       NODE_ENV: production
     volumes:
-      - /:/host/root:ro
       - /proc:/host/proc
       - /var/run/docker.sock:/var/run/docker.sock
       - ${PWD}/.env:/app/.env

package.json

@@ -1,6 +1,6 @@
 {
   "name": "runtipi",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "A homeserver for everyone",
   "scripts": {
     "knip": "knip",

packages/cli/assets/docker-compose.yml

@@ -21,7 +21,7 @@ services:
   tipi-db:
     container_name: tipi-db
     image: postgres:14
-    restart: on-failure
+    restart: unless-stopped
     stop_grace_period: 1m
     ports:
       - ${POSTGRES_PORT:-5432}:5432
@@ -60,7 +60,6 @@ services:
     container_name: tipi-worker
     image: ghcr.io/runtipi/worker:${TIPI_VERSION}
     restart: unless-stopped
-    user: root
     healthcheck:
       test: ['CMD', 'curl', '-f', 'http://localhost:3000/healthcheck']
       interval: 5s
@@ -78,7 +77,6 @@ services:
       NODE_ENV: production
     volumes:
       # Core
-      - /:/host/root:ro
       - /proc:/host/proc
       - /var/run/docker.sock:/var/run/docker.sock
       # App

packages/worker/src/services/system/system.executors.ts

@@ -36,8 +36,7 @@ export class SystemExecutors {
       this.logger.error(`Unable to read /host/proc/meminfo: ${e}`);
     }
 
-    const disks = await si.fsSize();
+    const [disk0] = await si.fsSize();
-    const disk0 = disks.find((disk) => disk.mount.startsWith('/host/root')) || disks[0];
 
     return {
       cpu: { load: currentLoad },

scripts/install.sh

@@ -121,16 +121,12 @@ if ! command -v docker >/dev/null; then
   install_docker "${OS}"
   docker_result=$?
 
-  if [[ docker_result -eq 0 ]]; then
+  if [[ docker_result -ne 0 ]]; then
-    echo "Docker installed"
-  else
     echo "Your system ${OS} is not supported trying with sub_os ${SUB_OS}"
     install_docker "${SUB_OS}"
     docker_sub_result=$?
 
-    if [[ docker_sub_result -eq 0 ]]; then
+    if [[ docker_sub_result -ne 0 ]]; then
-      echo "Docker installed"
-    else
       echo "Your system ${SUB_OS} is not supported please install docker manually"
       exit 1
     fi
@@ -138,11 +134,15 @@ if ! command -v docker >/dev/null; then
 
   # Make sure user is in docker group
   if ! groups | grep -q '\bdocker\b'; then
+    echo "Adding user to docker group"
     sudo usermod -aG docker "$USER"
+    echo "✓ Docker installed. Please re-run the installation script to continue with the installation. (curl -L https://setup.runtipi.io | bash)"
   fi
 
   # Reload user groups
   newgrp docker
+
+  exit 0
 fi
 
 function check_dependency_and_install() {