From fa4937b6973731c87e5f30648d386d23ad71f203 Mon Sep 17 00:00:00 2001 From: ms Date: Wed, 14 Aug 2024 20:53:40 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20Ubuntu=20=E6=9D=83?= =?UTF-8?q?=E9=99=90=E4=B8=8D=E8=B6=B3=EF=BC=8C=E9=80=A0=E6=88=90=E5=AE=89?= =?UTF-8?q?=E8=A3=85=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- script/app_install.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/script/app_install.sh b/script/app_install.sh index 25db06a5..2aabda39 100644 --- a/script/app_install.sh +++ b/script/app_install.sh @@ -51,6 +51,10 @@ repos=( 'https://gitea.com/QYG2297248353/appstore-1panel' ) +if [ -d "${BASE_DIR:?}/1panel/resource/apps/local/appstore-localApps" ]; then + rm -rf "${BASE_DIR:?}/1panel/resource/apps/local/appstore-localApps" +fi + for repo in "${repos[@]}"; do echo "$(date): Step 1 - Cloning repository: $repo" git clone --depth 1 -b released "$repo" "${BASE_DIR:?}/1panel/resource/apps/local/appstore-localApps" && break @@ -74,6 +78,10 @@ if [ ! -w "$LOCAL_DIR" ]; then exit 1 fi +if [ ! -d "$DEST_ENVS_DIR" ]; then + mkdir -p "$DEST_ENVS_DIR" +fi + if [ ! -w "$DEST_ENVS_DIR" ]; then echo "Error: No write permission to $DEST_ENVS_DIR." echo "Please run as a superuser." From d45a808b6f8be65ede12b20217440946ce51a3b6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 14 Aug 2024 17:16:57 +0000 Subject: [PATCH 2/5] Update 1dev/server Docker tag to v11.0.4 --- apps/onedev/11.0.3/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/onedev/11.0.3/docker-compose.yml b/apps/onedev/11.0.3/docker-compose.yml index b230ce33..6d3bfefa 100644 --- a/apps/onedev/11.0.3/docker-compose.yml +++ b/apps/onedev/11.0.3/docker-compose.yml @@ -6,7 +6,7 @@ networks: services: onedev: - image: 1dev/server:11.0.3 + image: 1dev/server:11.0.4 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" From 20c2886f65d4ff65bff65dd59dc4c76d4432ead1 Mon Sep 17 00:00:00 2001 From: github-action update-app-version Date: Wed, 14 Aug 2024 17:17:09 +0000 Subject: [PATCH 3/5] Update app version [skip ci] --- apps/onedev/{11.0.3 => 11.0.4}/data.yml | 0 apps/onedev/{11.0.3 => 11.0.4}/docker-compose.yml | 0 apps/onedev/{11.0.3 => 11.0.4}/scripts/init.sh | 0 apps/onedev/{11.0.3 => 11.0.4}/scripts/uninstall.sh | 0 apps/onedev/{11.0.3 => 11.0.4}/scripts/upgrade.sh | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename apps/onedev/{11.0.3 => 11.0.4}/data.yml (100%) rename apps/onedev/{11.0.3 => 11.0.4}/docker-compose.yml (100%) rename apps/onedev/{11.0.3 => 11.0.4}/scripts/init.sh (100%) rename apps/onedev/{11.0.3 => 11.0.4}/scripts/uninstall.sh (100%) rename apps/onedev/{11.0.3 => 11.0.4}/scripts/upgrade.sh (100%) diff --git a/apps/onedev/11.0.3/data.yml b/apps/onedev/11.0.4/data.yml similarity index 100% rename from apps/onedev/11.0.3/data.yml rename to apps/onedev/11.0.4/data.yml diff --git a/apps/onedev/11.0.3/docker-compose.yml b/apps/onedev/11.0.4/docker-compose.yml similarity index 100% rename from apps/onedev/11.0.3/docker-compose.yml rename to apps/onedev/11.0.4/docker-compose.yml diff --git a/apps/onedev/11.0.3/scripts/init.sh b/apps/onedev/11.0.4/scripts/init.sh similarity index 100% rename from apps/onedev/11.0.3/scripts/init.sh rename to apps/onedev/11.0.4/scripts/init.sh diff --git a/apps/onedev/11.0.3/scripts/uninstall.sh b/apps/onedev/11.0.4/scripts/uninstall.sh similarity index 100% rename from apps/onedev/11.0.3/scripts/uninstall.sh rename to apps/onedev/11.0.4/scripts/uninstall.sh diff --git a/apps/onedev/11.0.3/scripts/upgrade.sh b/apps/onedev/11.0.4/scripts/upgrade.sh similarity index 100% rename from apps/onedev/11.0.3/scripts/upgrade.sh rename to apps/onedev/11.0.4/scripts/upgrade.sh From a00d276c22bc6b669658b28874529d7c3f578db7 Mon Sep 17 00:00:00 2001 From: Meng Sen Date: Thu, 15 Aug 2024 11:03:46 +0800 Subject: [PATCH 4/5] Update renovate-app-version.sh --- .github/workflows/renovate-app-version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/renovate-app-version.sh b/.github/workflows/renovate-app-version.sh index 1f6abcd1..8cdde70e 100644 --- a/.github/workflows/renovate-app-version.sh +++ b/.github/workflows/renovate-app-version.sh @@ -6,7 +6,7 @@ old_version=$2 # 定义关联数组，将应用名称与其对应的 keys 关联起来 declare -A app_keys -app_keys=(["immich"]="immich-server immich-machine-learning" ["stream-rec"]="stream-rec-backend stream-rec-frontend") +app_keys=(["immich"]="immich immich-server immich-machine-learning" ["stream-rec"]="stream-rec-backend stream-rec-frontend") echo "Processing app: $app_name, old version: $old_version" From 97758e825dccf37c2d8dd288fb434aa3463d536c Mon Sep 17 00:00:00 2001 From: Meng Sen Date: Thu, 15 Aug 2024 11:04:50 +0800 Subject: [PATCH 5/5] Update renovate-app-version.sh --- .github/workflows/renovate-app-version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/renovate-app-version.sh b/.github/workflows/renovate-app-version.sh index 8cdde70e..1f6abcd1 100644 --- a/.github/workflows/renovate-app-version.sh +++ b/.github/workflows/renovate-app-version.sh @@ -6,7 +6,7 @@ old_version=$2 # 定义关联数组，将应用名称与其对应的 keys 关联起来 declare -A app_keys -app_keys=(["immich"]="immich immich-server immich-machine-learning" ["stream-rec"]="stream-rec-backend stream-rec-frontend") +app_keys=(["immich"]="immich-server immich-machine-learning" ["stream-rec"]="stream-rec-backend stream-rec-frontend") echo "Processing app: $app_name, old version: $old_version"