2.1.12rc1

Websoft9 · Sep 5, 2024 · 2f3ba50 · 2f3ba50
1 parent 648a45e
commit 2f3ba50
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 14 deletions.
diff --git 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
@@ -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 "[email protected]" \
-      #      -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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,5 +1,5 @@
 {
-  "version": "2.1.12-rc4",
+  "version": "2.1.12-rc1",
   "plugins": {
     "portainer": "0.1.2",
     "nginx": "0.0.9",