From 2f3ba508791965cc5f494d8bed6c437999fe509f Mon Sep 17 00:00:00 2001 From: qiaofeng1227 <76487013@qq.com> Date: Thu, 5 Sep 2024 09:04:28 +0800 Subject: [PATCH] 2.1.12rc1 --- .github/workflows/docker.yml | 2 +- .github/workflows/release.yml | 2 +- apphub/install.sh | 2 +- docker/.env | 2 +- docker/apphub/Dockerfile | 6 +++--- install/install.sh | 2 +- install/install_plugins.sh | 2 +- scripts/install-bk.sh | 4 ++-- scripts/update-bk.sh | 2 +- scripts/update_zip.sh | 2 +- version.json | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 39262d72..ac4921da 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -102,7 +102,7 @@ jobs: - name: Download media-latest.zip from Websoft9 artifact run: | - curl -o media.zip https://w9artifact.blob.core.windows.net/release/websoft9/plugin/media/media-latest.zip + curl -o media.zip https://artifact.websoft9.com/release/websoft9/plugin/media/media-latest.zip if: env.MEDIA_FROM == 'artifact' # release docker-library diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fe944c37..0d1522e8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -133,7 +133,7 @@ jobs: curl -X POST "https://api.cloudflare.com/client/v4/accounts/eb79f13320db531d8cf1f3720966b695/pages/projects/doc-websoft9-com/deployments" \ -H "Authorization: Bearer ${{ secrets.CLOUDFLARE_API_TOKEN }}" \ -F "file=@apidocs.zip" \ - # -F "branch=dev" + -F "branch=dev" # - name: Publish to Cloudflare Pages # uses: cloudflare/pages-action@v1 diff --git a/apphub/install.sh b/apphub/install.sh index 6a4f16ff..35a6741d 100755 --- a/apphub/install.sh +++ b/apphub/install.sh @@ -107,7 +107,7 @@ export source_github_pages="https://websoft9.github.io/websoft9" export tools_yum="git curl wget epel-release yum-utils jq bc unzip inotify-tools" export tools_apt="git curl wget jq bc unzip inotify-tools" export docker_network="websoft9" -export artifact_url="https://w9artifact.blob.core.windows.net/$channel/websoft9" +export artifact_url="https://artifact.websoft9.com/$channel/websoft9" echo Install from url: $artifact_url # Define common functions diff --git a/docker/.env b/docker/.env index eedd25aa..cdee95a1 100644 --- a/docker/.env +++ b/docker/.env @@ -1,4 +1,4 @@ -APPHUB_VERSION=0.1.1 +APPHUB_VERSION=0.1.2-rc1 DEPLOYMENT_VERSION=2.20.3 GIT_VERSION=1.21.9 PROXY_VERSION=2.11.3 \ No newline at end of file diff --git a/docker/apphub/Dockerfile b/docker/apphub/Dockerfile index c24d8360..d007332d 100644 --- a/docker/apphub/Dockerfile +++ b/docker/apphub/Dockerfile @@ -1,6 +1,6 @@ # This file can running at actions # MEDIA_VERSION and LIBRARY_VERSION will trigger its release -# modify time: 202409031549, you can modify here to trigger Docker Build action +# modify time: 202409050857, you can modify here to trigger Docker Build action FROM python:3.10-slim-bullseye @@ -12,12 +12,12 @@ WORKDIR /websoft9 ARG MEDIA_VERSION="0.1.1" ARG LIBRARY_VERSION="0.7.1" ARG WEBSOFT9_REPO="https://github.com/Websoft9/websoft9" -ARG WEBSOFT9_ARTIFACT="https://w9artifact.blob.core.windows.net/release/websoft9" +ARG WEBSOFT9_ARTIFACT="https://artifact.websoft9.com/release/websoft9" ARG LIBRARY_REPO="https://github.com/Websoft9/docker-library" ARG SOURCE_GITHUB_PAGES="https://websoft9.github.io/websoft9" # If you build this image on local, need download media.zip from WEBSOFT9_ARTIFACT to docker/apphub directory like below -# RUN curl -o media.zip https://w9artifact.blob.core.windows.net/release/websoft9/plugin/media/media-latest.zip +# RUN curl -o media.zip https://artifact.websoft9.com/release/websoft9/plugin/media/media-latest.zip COPY media.zip /websoft9 RUN apt update && apt install -y --no-install-recommends curl git jq cron iproute2 supervisor rsync wget unzip zip && \ diff --git a/install/install.sh b/install/install.sh index b07d1f70..dd2fbade 100644 --- a/install/install.sh +++ b/install/install.sh @@ -177,7 +177,7 @@ export repo_tools_yum="epel-release" export tools_yum="git curl wget yum-utils jq bc unzip inotify-tools" export tools_apt="git curl wget jq bc unzip inotify-tools" export docker_network="websoft9" -export artifact_url="https://w9artifact.blob.core.windows.net/$channel/websoft9" +export artifact_url="https://artifact.websoft9.com/$channel/websoft9" # export OS release environments if [ -f /etc/os-release ]; then . /etc/os-release diff --git a/install/install_plugins.sh b/install/install_plugins.sh index e60cad77..460a4b93 100644 --- a/install/install_plugins.sh +++ b/install/install_plugins.sh @@ -44,7 +44,7 @@ echo "Your installation parameters are as follows: " echo "--channel: $channel" echo "--install_path: $install_path" -artifact_url="https://w9artifact.blob.core.windows.net/$channel/websoft9/plugin" +artifact_url="https://artifact.websoft9.com/$channel/websoft9/plugin" echo_prefix_plugins=$'\n[Plugins] - ' versions_local_file="$install_path/version.json" diff --git a/scripts/install-bk.sh b/scripts/install-bk.sh index 16c98125..ce3ef657 100644 --- a/scripts/install-bk.sh +++ b/scripts/install-bk.sh @@ -8,10 +8,10 @@ function error_exit { } trap 'error_exit "Please push issue to: https://github.com/Websoft9/stackhub/issues"' ERR -urls="https://w9artifact.blob.core.windows.net/release/websoft9" +urls="https://artifact.websoft9.com/release/websoft9" if [[ "$1" == "dev" ]]; then echo "update by dev artifacts" - urls="https://w9artifact.blob.core.windows.net/dev/websoft9" + urls="https://artifact.websoft9.com/dev/websoft9" fi function get_os_type() { diff --git a/scripts/update-bk.sh b/scripts/update-bk.sh index d5f9070f..6a0fae0a 100644 --- a/scripts/update-bk.sh +++ b/scripts/update-bk.sh @@ -8,7 +8,7 @@ function error_exit { } trap 'error_exit "Please push issue to: https://github.com/Websoft9/websoft9/issues"' ERR -urls="https://w9artifact.blob.core.windows.net/release/websoft9" +urls="https://artifact.websoft9.com/release/websoft9" CheckEnv(){ echo "------------------ Welcome to update websoft9's appstore, it will take 1-3 minutes -----------------" diff --git a/scripts/update_zip.sh b/scripts/update_zip.sh index 62c2031e..39607972 100644 --- a/scripts/update_zip.sh +++ b/scripts/update_zip.sh @@ -48,7 +48,7 @@ if [ -z "$package_name" ] || [ -z "$sync_to" ]; then fi # Define the artifact URL as a global variable -artifact_url="https://w9artifact.blob.core.windows.net/$channel/websoft9/plugin" +artifact_url="https://artifact.websoft9.com/$channel/websoft9/plugin" upgrade_zip() { diff --git a/version.json b/version.json index 98813f87..c8a168b2 100644 --- a/version.json +++ b/version.json @@ -1,5 +1,5 @@ { - "version": "2.1.12-rc4", + "version": "2.1.12-rc1", "plugins": { "portainer": "0.1.2", "nginx": "0.0.9",