From f570f4708e1b1d3d5ac8e5d45c678e2518f36fa9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 28 Feb 2024 19:10:08 +0000 Subject: [PATCH 1/8] chore(deps): update pglombardo/pwpush docker tag to v1.37.10 --- apps/passwordpusher/1.37.9/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/passwordpusher/1.37.9/docker-compose.yml b/apps/passwordpusher/1.37.9/docker-compose.yml index 55ba544bb..2d3faa313 100644 --- a/apps/passwordpusher/1.37.9/docker-compose.yml +++ b/apps/passwordpusher/1.37.9/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" From 60a2fc3b810e5fcb3718c73ebc86c14df1306a34 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Wed, 28 Feb 2024 19:10:19 +0000 Subject: [PATCH 2/8] Update app version [skip ci] --- apps/passwordpusher/{1.37.9 => 1.37.10}/.env.sample | 0 apps/passwordpusher/{1.37.9 => 1.37.10}/data.yml | 0 apps/passwordpusher/{1.37.9 => 1.37.10}/docker-compose.yml | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename apps/passwordpusher/{1.37.9 => 1.37.10}/.env.sample (100%) rename apps/passwordpusher/{1.37.9 => 1.37.10}/data.yml (100%) rename apps/passwordpusher/{1.37.9 => 1.37.10}/docker-compose.yml (100%) diff --git a/apps/passwordpusher/1.37.9/.env.sample b/apps/passwordpusher/1.37.10/.env.sample similarity index 100% rename from apps/passwordpusher/1.37.9/.env.sample rename to apps/passwordpusher/1.37.10/.env.sample diff --git a/apps/passwordpusher/1.37.9/data.yml b/apps/passwordpusher/1.37.10/data.yml similarity index 100% rename from apps/passwordpusher/1.37.9/data.yml rename to apps/passwordpusher/1.37.10/data.yml diff --git a/apps/passwordpusher/1.37.9/docker-compose.yml b/apps/passwordpusher/1.37.10/docker-compose.yml similarity index 100% rename from apps/passwordpusher/1.37.9/docker-compose.yml rename to apps/passwordpusher/1.37.10/docker-compose.yml From 8eda4f4cddd533e286ae9ad69aca01b578bc0b35 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 29 Feb 2024 05:20:08 +0000 Subject: [PATCH 3/8] chore(deps): update linuxserver/code-server docker tag to v4.21.2 --- apps/code-server/4.21.1/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/code-server/4.21.1/docker-compose.yml b/apps/code-server/4.21.1/docker-compose.yml index 85b7668fa..c523ea023 100644 --- a/apps/code-server/4.21.1/docker-compose.yml +++ b/apps/code-server/4.21.1/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" From 92fc36378b6a0cef3d9aeb6916f0f182d56b6c53 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Thu, 29 Feb 2024 05:20:18 +0000 Subject: [PATCH 4/8] Update app version [skip ci] --- apps/code-server/{4.21.1 => 4.21.2}/.env.sample | 0 apps/code-server/{4.21.1 => 4.21.2}/data.yml | 0 apps/code-server/{4.21.1 => 4.21.2}/docker-compose.yml | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename apps/code-server/{4.21.1 => 4.21.2}/.env.sample (100%) rename apps/code-server/{4.21.1 => 4.21.2}/data.yml (100%) rename apps/code-server/{4.21.1 => 4.21.2}/docker-compose.yml (100%) diff --git a/apps/code-server/4.21.1/.env.sample b/apps/code-server/4.21.2/.env.sample similarity index 100% rename from apps/code-server/4.21.1/.env.sample rename to apps/code-server/4.21.2/.env.sample diff --git a/apps/code-server/4.21.1/data.yml b/apps/code-server/4.21.2/data.yml similarity index 100% rename from apps/code-server/4.21.1/data.yml rename to apps/code-server/4.21.2/data.yml diff --git a/apps/code-server/4.21.1/docker-compose.yml b/apps/code-server/4.21.2/docker-compose.yml similarity index 100% rename from apps/code-server/4.21.1/docker-compose.yml rename to apps/code-server/4.21.2/docker-compose.yml From 3b43ff944d492df60450a56610c6df7b54e3e6aa Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 29 Feb 2024 05:43:20 +0000 Subject: [PATCH 5/8] chore(deps): update gdy666/lucky docker tag to v2.7.2 --- apps/lucky/2.7.1/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/lucky/2.7.1/docker-compose.yml b/apps/lucky/2.7.1/docker-compose.yml index 65cc5a4ec..696ada7aa 100644 --- a/apps/lucky/2.7.1/docker-compose.yml +++ b/apps/lucky/2.7.1/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" From a2cb3f5113df151528a4fcc9ad7e691052d736d7 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Thu, 29 Feb 2024 05:43:34 +0000 Subject: [PATCH 6/8] Update app version [skip ci] --- apps/lucky/{2.7.1 => 2.7.2}/.env.sample | 0 apps/lucky/{2.7.1 => 2.7.2}/data.yml | 0 apps/lucky/{2.7.1 => 2.7.2}/docker-compose.yml | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename apps/lucky/{2.7.1 => 2.7.2}/.env.sample (100%) rename apps/lucky/{2.7.1 => 2.7.2}/data.yml (100%) rename apps/lucky/{2.7.1 => 2.7.2}/docker-compose.yml (100%) diff --git a/apps/lucky/2.7.1/.env.sample b/apps/lucky/2.7.2/.env.sample similarity index 100% rename from apps/lucky/2.7.1/.env.sample rename to apps/lucky/2.7.2/.env.sample diff --git a/apps/lucky/2.7.1/data.yml b/apps/lucky/2.7.2/data.yml similarity index 100% rename from apps/lucky/2.7.1/data.yml rename to apps/lucky/2.7.2/data.yml diff --git a/apps/lucky/2.7.1/docker-compose.yml b/apps/lucky/2.7.2/docker-compose.yml similarity index 100% rename from apps/lucky/2.7.1/docker-compose.yml rename to apps/lucky/2.7.2/docker-compose.yml From c2c730ce232c8385a793ad2e4f8c6d91241cda1e Mon Sep 17 00:00:00 2001 From: okxlin Date: Thu, 29 Feb 2024 21:00:45 +0800 Subject: [PATCH 7/8] =?UTF-8?q?feat:=E6=9B=B4=E6=96=B0immich=201.97.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/immich/{1.95.1 => 1.97.0}/.env.sample | 0 apps/immich/{1.95.1 => 1.97.0}/config.env | 0 apps/immich/{1.95.1 => 1.97.0}/data.yml | 0 apps/immich/{1.95.1 => 1.97.0}/docker-compose.yml | 6 +++--- 4 files changed, 3 insertions(+), 3 deletions(-) rename apps/immich/{1.95.1 => 1.97.0}/.env.sample (100%) rename apps/immich/{1.95.1 => 1.97.0}/config.env (100%) rename apps/immich/{1.95.1 => 1.97.0}/data.yml (100%) rename apps/immich/{1.95.1 => 1.97.0}/docker-compose.yml (92%) diff --git a/apps/immich/1.95.1/.env.sample b/apps/immich/1.97.0/.env.sample similarity index 100% rename from apps/immich/1.95.1/.env.sample rename to apps/immich/1.97.0/.env.sample diff --git a/apps/immich/1.95.1/config.env b/apps/immich/1.97.0/config.env similarity index 100% rename from apps/immich/1.95.1/config.env rename to apps/immich/1.97.0/config.env diff --git a/apps/immich/1.95.1/data.yml b/apps/immich/1.97.0/data.yml similarity index 100% rename from apps/immich/1.95.1/data.yml rename to apps/immich/1.97.0/data.yml diff --git a/apps/immich/1.95.1/docker-compose.yml b/apps/immich/1.97.0/docker-compose.yml similarity index 92% rename from apps/immich/1.95.1/docker-compose.yml rename to apps/immich/1.97.0/docker-compose.yml index 95afb90e4..69d0f6de7 100644 --- a/apps/immich/1.95.1/docker-compose.yml +++ b/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: From 9f1e991ee54808323923905c92dd2c0dcf755342 Mon Sep 17 00:00:00 2001 From: okxlin Date: Thu, 29 Feb 2024 21:30:40 +0800 Subject: [PATCH 8/8] =?UTF-8?q?feat:=E6=9B=B4=E6=96=B0=E9=95=BF=E4=BA=AD?= =?UTF-8?q?=E9=9B=B7=E6=B1=A04.4.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/safeline/{4.3.3 => 4.4.0}/.env.sample | 0 apps/safeline/{4.3.3 => 4.4.0}/data.yml | 0 .../{4.3.3 => 4.4.0}/docker-compose.yml | 21 ++++++++++++------- apps/safeline/latest/docker-compose.yml | 7 ++++++- .../.env.sample | 0 .../{newnet-4.3.3 => newnet-4.4.0}/data.yml | 0 .../docker-compose.yml | 21 ++++++++++++------- .../safeline/newnet-latest/docker-compose.yml | 7 ++++++- 8 files changed, 38 insertions(+), 18 deletions(-) rename apps/safeline/{4.3.3 => 4.4.0}/.env.sample (100%) rename apps/safeline/{4.3.3 => 4.4.0}/data.yml (100%) rename apps/safeline/{4.3.3 => 4.4.0}/docker-compose.yml (89%) rename apps/safeline/{newnet-4.3.3 => newnet-4.4.0}/.env.sample (100%) rename apps/safeline/{newnet-4.3.3 => newnet-4.4.0}/data.yml (100%) rename apps/safeline/{newnet-4.3.3 => newnet-4.4.0}/docker-compose.yml (89%) diff --git a/apps/safeline/4.3.3/.env.sample b/apps/safeline/4.4.0/.env.sample similarity index 100% rename from apps/safeline/4.3.3/.env.sample rename to apps/safeline/4.4.0/.env.sample diff --git a/apps/safeline/4.3.3/data.yml b/apps/safeline/4.4.0/data.yml similarity index 100% rename from apps/safeline/4.3.3/data.yml rename to apps/safeline/4.4.0/data.yml diff --git a/apps/safeline/4.3.3/docker-compose.yml b/apps/safeline/4.4.0/docker-compose.yml similarity index 89% rename from apps/safeline/4.3.3/docker-compose.yml rename to apps/safeline/4.4.0/docker-compose.yml index 5161cf74a..2e1c315be 100644 --- a/apps/safeline/4.3.3/docker-compose.yml +++ b/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 diff --git a/apps/safeline/latest/docker-compose.yml b/apps/safeline/latest/docker-compose.yml index ed5988fdb..6f2c85845 100644 --- a/apps/safeline/latest/docker-compose.yml +++ b/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 diff --git a/apps/safeline/newnet-4.3.3/.env.sample b/apps/safeline/newnet-4.4.0/.env.sample similarity index 100% rename from apps/safeline/newnet-4.3.3/.env.sample rename to apps/safeline/newnet-4.4.0/.env.sample diff --git a/apps/safeline/newnet-4.3.3/data.yml b/apps/safeline/newnet-4.4.0/data.yml similarity index 100% rename from apps/safeline/newnet-4.3.3/data.yml rename to apps/safeline/newnet-4.4.0/data.yml diff --git a/apps/safeline/newnet-4.3.3/docker-compose.yml b/apps/safeline/newnet-4.4.0/docker-compose.yml similarity index 89% rename from apps/safeline/newnet-4.3.3/docker-compose.yml rename to apps/safeline/newnet-4.4.0/docker-compose.yml index adc3214bb..972881a41 100644 --- a/apps/safeline/newnet-4.3.3/docker-compose.yml +++ b/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 diff --git a/apps/safeline/newnet-latest/docker-compose.yml b/apps/safeline/newnet-latest/docker-compose.yml index 682a3adb0..7f59bb754 100644 --- a/apps/safeline/newnet-latest/docker-compose.yml +++ b/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