Merge branch ''dockerize/server' of hostbbq/hostbbq-monitoring into master

server.docker-compose.yml

@@ -12,8 +12,6 @@ services:
       - NOTIFICATION_ICON_URL="https://fcm.hostbbq.net/logo.png"
     ports:
       - $HOST_PORT:$WEB_PORT
-    volumes:
-      - 'data-dir:/home/node/monitoring/data'
     links:
       - mariadb
     extra_hosts:
@@ -31,15 +29,9 @@ services:
       - db-dir:/var/lib/mysql
     restart: always
 volumes:
-  data-dir:
-    driver: local
-    driver_opts:
-      o: bind
-      type: none
-      device: $DATA_VOLUME_DIR
   db-dir:
     driver: local
     driver_opts:
       o: bind
       type: none
-      device: $DB_VOLUME_DIR
+      device: $DB_DIR

server/install/install.sh

@@ -81,10 +81,8 @@ cp -v "$TMPFOLDER/server.docker-compose.yml" "$INSTALL_DIR/docker-compose.yml"
 
 cd "$INSTALL_DIR"
 
-DATA_VOLUME_DIR="$INSTALL_DIR/$DATA_DIR" \
-DB_VOLUME_DIR="$INSTALL_DIR/$DB_DIR" \
 COMPOSE_PROJECT_NAME="monitoring-server" \
-docker compose up -d
+docker compose up -d --force-recreate
 
 echo "[CLEANUP] Removing temp folder $TMPFOLDER"
 rm -rf "$TMPFOLDER"