Merge branch 'okxlin:localApps' into apps/mixspace

apps/code-server/4.21.2/docker-compose.yml

@@ -16,7 +16,7 @@ services:
       - PASSWORD=${WEB_PASSWORD} 
       - SUDO_PASSWORD=${SUDO_PASSWORD} 
       - DEFAULT_WORKSPACE=/config/workspace
-    image: linuxserver/code-server:4.21.1
+    image: linuxserver/code-server:4.21.2
     labels:  
       createdBy: "Apps"
 

apps/immich/1.97.0/docker-compose.yml

@@ -5,7 +5,7 @@ services:
     restart: always
     networks:
       - 1panel-network
-    image: altran1502/immich-server:v1.95.1
+    image: altran1502/immich-server:v1.97.0
     command: [ "start.sh", "immich" ]
     volumes:
       - ${UPLOAD_LOCATION}:/usr/src/app/upload
@@ -25,7 +25,7 @@ services:
     restart: always
     networks:
       - 1panel-network
-    image: altran1502/immich-server:v1.95.1
+    image: altran1502/immich-server:v1.97.0
     # extends:
     #   file: hwaccel.yml
     #   service: hwaccel
@@ -46,7 +46,7 @@ services:
     restart: always
     networks:
       - 1panel-network
-    image: altran1502/immich-machine-learning:v1.95.1
+    image: altran1502/immich-machine-learning:v1.97.0
     volumes:
       - ${CACHE_PATH}:/cache
     env_file:

apps/lucky/2.7.2/docker-compose.yml

@@ -6,6 +6,6 @@ services:
     network_mode: host
     volumes:
       - ${DATA_PATH}:/goodluck
-    image: gdy666/lucky:2.7.1
+    image: gdy666/lucky:2.7.2
     labels:  
       createdBy: "Apps"

apps/passwordpusher/1.37.10/docker-compose.yml

@@ -9,7 +9,7 @@ services:
       - "${PANEL_APP_PORT_HTTP}:5100"
     environment:
       - DATABASE_URL=mysql2://${PANEL_DB_USER}:${PANEL_DB_USER_PASSWORD}@${PANEL_DB_HOST}:${PWPUSHER_DB_PORT}/${PANEL_DB_NAME}
-    image: pglombardo/pwpush:1.37.9
+    image: pglombardo/pwpush:1.37.10
     labels:  
       createdBy: "Apps"
 

apps/safeline/4.4.0/docker-compose.yml

@@ -6,7 +6,7 @@ services:
     networks:
       1panel-network:
         ipv4_address: ${SUBNET_PREFIX}.234
-    image: chaitin/safeline-mgt:4.3.3
+    image: chaitin/safeline-mgt:4.4.0
     volumes:
     - /etc/localtime:/etc/localtime:ro
     - ${SAFELINE_DIR}/resources/mgt:/app/data
@@ -37,7 +37,7 @@ services:
     networks:
       1panel-network:
         ipv4_address: ${SUBNET_PREFIX}.235
-    image: chaitin/safeline-detector:4.3.3
+    image: chaitin/safeline-detector:4.4.0
     volumes:
     - ${SAFELINE_DIR}/resources/detector:/resources/detector
     - ${SAFELINE_DIR}/logs/detector:/logs/detector
@@ -53,7 +53,7 @@ services:
     networks:
       1panel-network:
         ipv4_address: ${SUBNET_PREFIX}.236
-    image: chaitin/safeline-mario:4.3.3
+    image: chaitin/safeline-mario:4.4.0
     volumes:
     - ${SAFELINE_DIR}/resources/mario:/resources/mario
     - ${SAFELINE_DIR}/logs/mario:/logs/mario
@@ -68,10 +68,10 @@ services:
   safeline-tengine:
     container_name: ${CONTAINER_NAME}-tengine
     restart: always
-    image: chaitin/safeline-tengine:4.3.3
+    image: chaitin/safeline-tengine:4.4.0
     volumes:
     - /etc/localtime:/etc/localtime:ro
-    - /etc/resolv.conf:/etc/resolv.conf
+    - /etc/resolv.conf:/etc/resolv.conf:ro
     - ${SAFELINE_DIR}/resources/nginx:/etc/nginx
     - ${SAFELINE_DIR}/resources/detector:/resources/detector
     - ${SAFELINE_DIR}/logs/nginx:/var/log/nginx
@@ -91,10 +91,15 @@ services:
     networks:
       1panel-network:
         ipv4_address: ${SUBNET_PREFIX}.237
-    image: chaitin/safeline-luigi:4.3.3
+    image: chaitin/safeline-luigi:4.4.0
     volumes:
       - /etc/localtime:/etc/localtime:ro
       - ${SAFELINE_DIR}/resources/luigi:/app/data
+    environment:
+      - MGT_IP=${SUBNET_PREFIX}.234
+    depends_on:
+      - safeline-detector
+      - safeline-mgt
     labels:
       createdBy: Apps
 
@@ -104,7 +109,7 @@ services:
     networks:
       1panel-network:
         ipv4_address: ${SUBNET_PREFIX}.238
-    image: chaitin/safeline-fvm:4.3.3
+    image: chaitin/safeline-fvm:4.4.0
     volumes:
       - /etc/localtime:/etc/localtime:ro
     labels:
@@ -116,7 +121,7 @@ services:
     networks:
       1panel-network:
         ipv4_address: ${SUBNET_PREFIX}.239
-    image: chaitin/safeline-bridge:4.3.3
+    image: chaitin/safeline-bridge:4.4.0
     volumes:
       - /etc/localtime:/etc/localtime:ro
       - /var/run:/app/run

apps/safeline/latest/docker-compose.yml

@@ -71,7 +71,7 @@ services:
     image: chaitin/safeline-tengine:latest
     volumes:
     - /etc/localtime:/etc/localtime:ro
-    - /etc/resolv.conf:/etc/resolv.conf
+    - /etc/resolv.conf:/etc/resolv.conf:ro
     - ${SAFELINE_DIR}/resources/nginx:/etc/nginx
     - ${SAFELINE_DIR}/resources/detector:/resources/detector
     - ${SAFELINE_DIR}/logs/nginx:/var/log/nginx
@@ -95,6 +95,11 @@ services:
     volumes:
       - /etc/localtime:/etc/localtime:ro
       - ${SAFELINE_DIR}/resources/luigi:/app/data
+    environment:
+      - MGT_IP=${SUBNET_PREFIX}.234
+    depends_on:
+      - safeline-detector
+      - safeline-mgt
     labels:
       createdBy: Apps
 

apps/safeline/newnet-4.4.0/docker-compose.yml

@@ -7,7 +7,7 @@ services:
       1panel-network:
       safeline-ce:
         ipv4_address: ${SUBNET_PREFIX}.4
-    image: chaitin/safeline-mgt:4.3.3
+    image: chaitin/safeline-mgt:4.4.0
     volumes:
     - /etc/localtime:/etc/localtime:ro
     - ${SAFELINE_DIR}/resources/mgt:/app/data
@@ -39,7 +39,7 @@ services:
       1panel-network:
       safeline-ce:
         ipv4_address: ${SUBNET_PREFIX}.5
-    image: chaitin/safeline-detector:4.3.3
+    image: chaitin/safeline-detector:4.4.0
     volumes:
     - ${SAFELINE_DIR}/resources/detector:/resources/detector
     - ${SAFELINE_DIR}/logs/detector:/logs/detector
@@ -56,7 +56,7 @@ services:
       1panel-network:
       safeline-ce:
         ipv4_address: ${SUBNET_PREFIX}.6
-    image: chaitin/safeline-mario:4.3.3
+    image: chaitin/safeline-mario:4.4.0
     volumes:
     - ${SAFELINE_DIR}/resources/mario:/resources/mario
     - ${SAFELINE_DIR}/logs/mario:/logs/mario
@@ -71,10 +71,10 @@ services:
   safeline-tengine:
     container_name: ${CONTAINER_NAME}-tengine
     restart: always
-    image: chaitin/safeline-tengine:4.3.3
+    image: chaitin/safeline-tengine:4.4.0
     volumes:
     - /etc/localtime:/etc/localtime:ro
-    - /etc/resolv.conf:/etc/resolv.conf
+    - /etc/resolv.conf:/etc/resolv.conf:ro
     - ${SAFELINE_DIR}/resources/nginx:/etc/nginx
     - ${SAFELINE_DIR}/resources/detector:/resources/detector
     - ${SAFELINE_DIR}/logs/nginx:/var/log/nginx
@@ -95,10 +95,15 @@ services:
       1panel-network:
       safeline-ce:
         ipv4_address: ${SUBNET_PREFIX}.7
-    image: chaitin/safeline-luigi:4.3.3
+    image: chaitin/safeline-luigi:4.4.0
     volumes:
       - /etc/localtime:/etc/localtime:ro
       - ${SAFELINE_DIR}/resources/luigi:/app/data
+    environment:
+      - MGT_IP=${SUBNET_PREFIX}.4
+    depends_on:
+      - safeline-detector
+      - safeline-mgt
     labels:
       createdBy: Apps
 
@@ -109,7 +114,7 @@ services:
       1panel-network:
       safeline-ce:
         ipv4_address: ${SUBNET_PREFIX}.8
-    image: chaitin/safeline-fvm:4.3.3
+    image: chaitin/safeline-fvm:4.4.0
     volumes:
       - /etc/localtime:/etc/localtime:ro
     labels:
@@ -122,7 +127,7 @@ services:
       1panel-network:
       safeline-ce:
         ipv4_address: ${SUBNET_PREFIX}.9
-    image: chaitin/safeline-bridge:4.3.3
+    image: chaitin/safeline-bridge:4.4.0
     volumes:
       - /etc/localtime:/etc/localtime:ro
       - /var/run:/app/run

apps/safeline/newnet-latest/docker-compose.yml

@@ -74,7 +74,7 @@ services:
     image: chaitin/safeline-tengine:latest
     volumes:
     - /etc/localtime:/etc/localtime:ro
-    - /etc/resolv.conf:/etc/resolv.conf
+    - /etc/resolv.conf:/etc/resolv.conf:ro
     - ${SAFELINE_DIR}/resources/nginx:/etc/nginx
     - ${SAFELINE_DIR}/resources/detector:/resources/detector
     - ${SAFELINE_DIR}/logs/nginx:/var/log/nginx
@@ -99,6 +99,11 @@ services:
     volumes:
       - /etc/localtime:/etc/localtime:ro
       - ${SAFELINE_DIR}/resources/luigi:/app/data
+    environment:
+      - MGT_IP=${SUBNET_PREFIX}.4
+    depends_on:
+      - safeline-detector
+      - safeline-mgt
     labels:
       createdBy: Apps