From 0213b9f8aaa4836772cf0981ec71427f00b9c05c Mon Sep 17 00:00:00 2001 From: Meng Sen Date: Mon, 16 Dec 2024 10:51:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=9B=B4=E6=96=B0=E8=84=9A?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Meng Sen --- .github/workflows/renovate-app-version.sh | 10 ++-------- .../{1.122.3 => 1.122.2}/data.yml | 0 .../{1.122.3 => 1.122.2}/docker-compose.yml | 2 +- .../{1.122.3 => 1.122.2}/envs/default.env | 0 .../{1.122.3 => 1.122.2}/envs/global.env | 0 .../{1.122.3 => 1.122.2}/scripts/init.sh | 0 .../{1.122.3 => 1.122.2}/scripts/uninstall.sh | 0 .../{1.122.3 => 1.122.2}/scripts/upgrade.sh | 0 apps/immich-no-machine/{1.122.3 => 1.122.2}/data.yml | 0 .../{1.122.3 => 1.122.2}/docker-compose.yml | 2 +- .../{1.122.3 => 1.122.2}/envs/default.env | 0 .../{1.122.3 => 1.122.2}/envs/global.env | 0 .../{1.122.3 => 1.122.2}/scripts/init.sh | 0 .../{1.122.3 => 1.122.2}/scripts/uninstall.sh | 0 .../{1.122.3 => 1.122.2}/scripts/upgrade.sh | 0 apps/immich-server/{1.122.3 => 1.122.2}/data.yml | 0 .../{1.122.3 => 1.122.2}/docker-compose.yml | 2 +- .../{1.122.3 => 1.122.2}/envs/default.env | 0 .../immich-server/{1.122.3 => 1.122.2}/envs/global.env | 0 .../immich-server/{1.122.3 => 1.122.2}/scripts/init.sh | 0 .../{1.122.3 => 1.122.2}/scripts/uninstall.sh | 0 .../{1.122.3 => 1.122.2}/scripts/upgrade.sh | 0 apps/immich/{1.122.3 => 1.122.2}/data.yml | 0 apps/immich/{1.122.3 => 1.122.2}/docker-compose.yml | 4 ++-- apps/immich/{1.122.3 => 1.122.2}/envs/default.env | 0 apps/immich/{1.122.3 => 1.122.2}/envs/global.env | 0 apps/immich/{1.122.3 => 1.122.2}/scripts/init.sh | 0 apps/immich/{1.122.3 => 1.122.2}/scripts/uninstall.sh | 0 apps/immich/{1.122.3 => 1.122.2}/scripts/upgrade.sh | 0 29 files changed, 7 insertions(+), 13 deletions(-) rename apps/immich-machine-learning/{1.122.3 => 1.122.2}/data.yml (100%) rename apps/immich-machine-learning/{1.122.3 => 1.122.2}/docker-compose.yml (93%) rename apps/immich-machine-learning/{1.122.3 => 1.122.2}/envs/default.env (100%) rename apps/immich-machine-learning/{1.122.3 => 1.122.2}/envs/global.env (100%) rename apps/immich-machine-learning/{1.122.3 => 1.122.2}/scripts/init.sh (100%) rename apps/immich-machine-learning/{1.122.3 => 1.122.2}/scripts/uninstall.sh (100%) rename apps/immich-machine-learning/{1.122.3 => 1.122.2}/scripts/upgrade.sh (100%) rename apps/immich-no-machine/{1.122.3 => 1.122.2}/data.yml (100%) rename apps/immich-no-machine/{1.122.3 => 1.122.2}/docker-compose.yml (97%) rename apps/immich-no-machine/{1.122.3 => 1.122.2}/envs/default.env (100%) rename apps/immich-no-machine/{1.122.3 => 1.122.2}/envs/global.env (100%) rename apps/immich-no-machine/{1.122.3 => 1.122.2}/scripts/init.sh (100%) rename apps/immich-no-machine/{1.122.3 => 1.122.2}/scripts/uninstall.sh (100%) rename apps/immich-no-machine/{1.122.3 => 1.122.2}/scripts/upgrade.sh (100%) rename apps/immich-server/{1.122.3 => 1.122.2}/data.yml (100%) rename apps/immich-server/{1.122.3 => 1.122.2}/docker-compose.yml (94%) rename apps/immich-server/{1.122.3 => 1.122.2}/envs/default.env (100%) rename apps/immich-server/{1.122.3 => 1.122.2}/envs/global.env (100%) rename apps/immich-server/{1.122.3 => 1.122.2}/scripts/init.sh (100%) rename apps/immich-server/{1.122.3 => 1.122.2}/scripts/uninstall.sh (100%) rename apps/immich-server/{1.122.3 => 1.122.2}/scripts/upgrade.sh (100%) rename apps/immich/{1.122.3 => 1.122.2}/data.yml (100%) rename apps/immich/{1.122.3 => 1.122.2}/docker-compose.yml (95%) rename apps/immich/{1.122.3 => 1.122.2}/envs/default.env (100%) rename apps/immich/{1.122.3 => 1.122.2}/envs/global.env (100%) rename apps/immich/{1.122.3 => 1.122.2}/scripts/init.sh (100%) rename apps/immich/{1.122.3 => 1.122.2}/scripts/uninstall.sh (100%) rename apps/immich/{1.122.3 => 1.122.2}/scripts/upgrade.sh (100%) diff --git a/.github/workflows/renovate-app-version.sh b/.github/workflows/renovate-app-version.sh index 1b708d5e..48e050fb 100644 --- a/.github/workflows/renovate-app-version.sh +++ b/.github/workflows/renovate-app-version.sh @@ -88,10 +88,8 @@ for docker_compose_file in $docker_compose_files do echo "Processing docker-compose file: $docker_compose_file" - # 判断 app_name 是否在关联数组中 if [[ -n "${app_keys[$app_name]}" ]]; then echo "$app_name is in the app_keys list." - # 获取对应的 keys IFS=' ' read -r -a keys <<< "${app_keys[$app_name]}" for key in "${keys[@]}"; do echo "Processing key: $key" @@ -101,17 +99,15 @@ do image=$(yq .services.$first_service.image $docker_compose_file) echo "Found image for service $first_service: $image" - # 进行后续处理 process_image "$image" "$app_name" else echo "Key $key not found in $docker_compose_file" fi done - # 在循环完毕后执行版本移动操作 if [[ -n "$cleaned_version" ]]; then mv apps/$app_name/$old_version apps/$app_name/$cleaned_version - echo "Moved $old_version to $cleaned_version" + echo "Moved apps/$app_name/$old_version to apps/$app_name/$cleaned_version" else echo "Could not determine version for image: $image" fi @@ -122,13 +118,11 @@ do image=$(yq .services.$first_service.image $docker_compose_file) echo "Found image: $image" - # 进行后续处理 process_image "$image" "$app_name" - # 在处理第一个服务后执行版本移动操作 if [[ -n "$cleaned_version" ]]; then mv apps/$app_name/$old_version apps/$app_name/$cleaned_version - echo "Moved $old_version to $cleaned_version" + echo "Moved apps/$app_name/$old_version to apps/$app_name/$cleaned_version" else echo "Could not determine version for image: $image" fi diff --git a/apps/immich-machine-learning/1.122.3/data.yml b/apps/immich-machine-learning/1.122.2/data.yml similarity index 100% rename from apps/immich-machine-learning/1.122.3/data.yml rename to apps/immich-machine-learning/1.122.2/data.yml diff --git a/apps/immich-machine-learning/1.122.3/docker-compose.yml b/apps/immich-machine-learning/1.122.2/docker-compose.yml similarity index 93% rename from apps/immich-machine-learning/1.122.3/docker-compose.yml rename to apps/immich-machine-learning/1.122.2/docker-compose.yml index 064e5312..82b6b25f 100644 --- a/apps/immich-machine-learning/1.122.3/docker-compose.yml +++ b/apps/immich-machine-learning/1.122.2/docker-compose.yml @@ -6,7 +6,7 @@ name: immich-machine-learning services: immich-machine-learning: - image: ghcr.io/immich-app/immich-machine-learning:v1.122.3 + image: ghcr.io/immich-app/immich-machine-learning:v1.122.2 container_name: immich-machine-learning-${CONTAINER_NAME} labels: createdBy: "Apps" diff --git a/apps/immich-machine-learning/1.122.3/envs/default.env b/apps/immich-machine-learning/1.122.2/envs/default.env similarity index 100% rename from apps/immich-machine-learning/1.122.3/envs/default.env rename to apps/immich-machine-learning/1.122.2/envs/default.env diff --git a/apps/immich-machine-learning/1.122.3/envs/global.env b/apps/immich-machine-learning/1.122.2/envs/global.env similarity index 100% rename from apps/immich-machine-learning/1.122.3/envs/global.env rename to apps/immich-machine-learning/1.122.2/envs/global.env diff --git a/apps/immich-machine-learning/1.122.3/scripts/init.sh b/apps/immich-machine-learning/1.122.2/scripts/init.sh similarity index 100% rename from apps/immich-machine-learning/1.122.3/scripts/init.sh rename to apps/immich-machine-learning/1.122.2/scripts/init.sh diff --git a/apps/immich-machine-learning/1.122.3/scripts/uninstall.sh b/apps/immich-machine-learning/1.122.2/scripts/uninstall.sh similarity index 100% rename from apps/immich-machine-learning/1.122.3/scripts/uninstall.sh rename to apps/immich-machine-learning/1.122.2/scripts/uninstall.sh diff --git a/apps/immich-machine-learning/1.122.3/scripts/upgrade.sh b/apps/immich-machine-learning/1.122.2/scripts/upgrade.sh similarity index 100% rename from apps/immich-machine-learning/1.122.3/scripts/upgrade.sh rename to apps/immich-machine-learning/1.122.2/scripts/upgrade.sh diff --git a/apps/immich-no-machine/1.122.3/data.yml b/apps/immich-no-machine/1.122.2/data.yml similarity index 100% rename from apps/immich-no-machine/1.122.3/data.yml rename to apps/immich-no-machine/1.122.2/data.yml diff --git a/apps/immich-no-machine/1.122.3/docker-compose.yml b/apps/immich-no-machine/1.122.2/docker-compose.yml similarity index 97% rename from apps/immich-no-machine/1.122.3/docker-compose.yml rename to apps/immich-no-machine/1.122.2/docker-compose.yml index 516f9d40..6f3493c3 100644 --- a/apps/immich-no-machine/1.122.3/docker-compose.yml +++ b/apps/immich-no-machine/1.122.2/docker-compose.yml @@ -47,7 +47,7 @@ services: immich-server: depends_on: - immich-pg14-vectors - image: ghcr.io/immich-app/immich-server:v1.122.3 + image: ghcr.io/immich-app/immich-server:v1.122.2 container_name: immich-server-${CONTAINER_NAME} labels: createdBy: "Apps" diff --git a/apps/immich-no-machine/1.122.3/envs/default.env b/apps/immich-no-machine/1.122.2/envs/default.env similarity index 100% rename from apps/immich-no-machine/1.122.3/envs/default.env rename to apps/immich-no-machine/1.122.2/envs/default.env diff --git a/apps/immich-no-machine/1.122.3/envs/global.env b/apps/immich-no-machine/1.122.2/envs/global.env similarity index 100% rename from apps/immich-no-machine/1.122.3/envs/global.env rename to apps/immich-no-machine/1.122.2/envs/global.env diff --git a/apps/immich-no-machine/1.122.3/scripts/init.sh b/apps/immich-no-machine/1.122.2/scripts/init.sh similarity index 100% rename from apps/immich-no-machine/1.122.3/scripts/init.sh rename to apps/immich-no-machine/1.122.2/scripts/init.sh diff --git a/apps/immich-no-machine/1.122.3/scripts/uninstall.sh b/apps/immich-no-machine/1.122.2/scripts/uninstall.sh similarity index 100% rename from apps/immich-no-machine/1.122.3/scripts/uninstall.sh rename to apps/immich-no-machine/1.122.2/scripts/uninstall.sh diff --git a/apps/immich-no-machine/1.122.3/scripts/upgrade.sh b/apps/immich-no-machine/1.122.2/scripts/upgrade.sh similarity index 100% rename from apps/immich-no-machine/1.122.3/scripts/upgrade.sh rename to apps/immich-no-machine/1.122.2/scripts/upgrade.sh diff --git a/apps/immich-server/1.122.3/data.yml b/apps/immich-server/1.122.2/data.yml similarity index 100% rename from apps/immich-server/1.122.3/data.yml rename to apps/immich-server/1.122.2/data.yml diff --git a/apps/immich-server/1.122.3/docker-compose.yml b/apps/immich-server/1.122.2/docker-compose.yml similarity index 94% rename from apps/immich-server/1.122.3/docker-compose.yml rename to apps/immich-server/1.122.2/docker-compose.yml index cdc20692..f4c82325 100644 --- a/apps/immich-server/1.122.3/docker-compose.yml +++ b/apps/immich-server/1.122.2/docker-compose.yml @@ -6,7 +6,7 @@ name: immich-server services: immich-server: - image: ghcr.io/immich-app/immich-server:v1.122.3 + image: ghcr.io/immich-app/immich-server:v1.122.2 container_name: immich-server-${CONTAINER_NAME} labels: createdBy: "Apps" diff --git a/apps/immich-server/1.122.3/envs/default.env b/apps/immich-server/1.122.2/envs/default.env similarity index 100% rename from apps/immich-server/1.122.3/envs/default.env rename to apps/immich-server/1.122.2/envs/default.env diff --git a/apps/immich-server/1.122.3/envs/global.env b/apps/immich-server/1.122.2/envs/global.env similarity index 100% rename from apps/immich-server/1.122.3/envs/global.env rename to apps/immich-server/1.122.2/envs/global.env diff --git a/apps/immich-server/1.122.3/scripts/init.sh b/apps/immich-server/1.122.2/scripts/init.sh similarity index 100% rename from apps/immich-server/1.122.3/scripts/init.sh rename to apps/immich-server/1.122.2/scripts/init.sh diff --git a/apps/immich-server/1.122.3/scripts/uninstall.sh b/apps/immich-server/1.122.2/scripts/uninstall.sh similarity index 100% rename from apps/immich-server/1.122.3/scripts/uninstall.sh rename to apps/immich-server/1.122.2/scripts/uninstall.sh diff --git a/apps/immich-server/1.122.3/scripts/upgrade.sh b/apps/immich-server/1.122.2/scripts/upgrade.sh similarity index 100% rename from apps/immich-server/1.122.3/scripts/upgrade.sh rename to apps/immich-server/1.122.2/scripts/upgrade.sh diff --git a/apps/immich/1.122.3/data.yml b/apps/immich/1.122.2/data.yml similarity index 100% rename from apps/immich/1.122.3/data.yml rename to apps/immich/1.122.2/data.yml diff --git a/apps/immich/1.122.3/docker-compose.yml b/apps/immich/1.122.2/docker-compose.yml similarity index 95% rename from apps/immich/1.122.3/docker-compose.yml rename to apps/immich/1.122.2/docker-compose.yml index b3e84665..7f661f2e 100644 --- a/apps/immich/1.122.3/docker-compose.yml +++ b/apps/immich/1.122.2/docker-compose.yml @@ -47,7 +47,7 @@ services: immich-server: depends_on: - immich-pg14-vectors - image: ghcr.io/immich-app/immich-server:v1.122.3 + image: ghcr.io/immich-app/immich-server:v1.122.2 container_name: immich-server-${CONTAINER_NAME} labels: createdBy: "Apps" @@ -75,7 +75,7 @@ services: disable: false immich-machine-learning: - image: ghcr.io/immich-app/immich-machine-learning:v1.122.3 + image: ghcr.io/immich-app/immich-machine-learning:v1.122.2 container_name: immich-machine-learning-${CONTAINER_NAME} labels: createdBy: "Apps" diff --git a/apps/immich/1.122.3/envs/default.env b/apps/immich/1.122.2/envs/default.env similarity index 100% rename from apps/immich/1.122.3/envs/default.env rename to apps/immich/1.122.2/envs/default.env diff --git a/apps/immich/1.122.3/envs/global.env b/apps/immich/1.122.2/envs/global.env similarity index 100% rename from apps/immich/1.122.3/envs/global.env rename to apps/immich/1.122.2/envs/global.env diff --git a/apps/immich/1.122.3/scripts/init.sh b/apps/immich/1.122.2/scripts/init.sh similarity index 100% rename from apps/immich/1.122.3/scripts/init.sh rename to apps/immich/1.122.2/scripts/init.sh diff --git a/apps/immich/1.122.3/scripts/uninstall.sh b/apps/immich/1.122.2/scripts/uninstall.sh similarity index 100% rename from apps/immich/1.122.3/scripts/uninstall.sh rename to apps/immich/1.122.2/scripts/uninstall.sh diff --git a/apps/immich/1.122.3/scripts/upgrade.sh b/apps/immich/1.122.2/scripts/upgrade.sh similarity index 100% rename from apps/immich/1.122.3/scripts/upgrade.sh rename to apps/immich/1.122.2/scripts/upgrade.sh