github_mirrors/websoft9
1
0
Fork 0
mirror of https://github.com/Websoft9/websoft9.git synced 2025-01-23 01:00:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

2.1.12rc1

Browse Source
This commit is contained in:
qiaofeng1227 2024-09-05 09:04:28 +08:00
parent 648a45e32c
commit 2f3ba50879
11 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/docker.yml vendored
View File

@ -102,7 +102,7 @@ jobs:
- name: Download media-latest.zip from Websoft9 artifact - name: Download media-latest.zip from Websoft9 artifact
run: | 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' if: env.MEDIA_FROM == 'artifact'
# release docker-library # release docker-library

2
.github/workflows/release.yml vendored
View File

@ -133,7 +133,7 @@ jobs:
curl -X POST "https://api.cloudflare.com/client/v4/accounts/eb79f13320db531d8cf1f3720966b695/pages/projects/doc-websoft9-com/deployments" \ curl -X POST "https://api.cloudflare.com/client/v4/accounts/eb79f13320db531d8cf1f3720966b695/pages/projects/doc-websoft9-com/deployments" \
-H "Authorization: Bearer ${{ secrets.CLOUDFLARE_API_TOKEN }}" \ -H "Authorization: Bearer ${{ secrets.CLOUDFLARE_API_TOKEN }}" \
-F "file=@apidocs.zip" \ -F "file=@apidocs.zip" \
# -F "branch=dev" -F "branch=dev"
# - name: Publish to Cloudflare Pages # - name: Publish to Cloudflare Pages
# uses: cloudflare/pages-action@v1 # uses: cloudflare/pages-action@v1

2
apphub/install.sh
View File

@ -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_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 tools_apt="git curl wget jq bc unzip inotify-tools"
export docker_network="websoft9" 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 echo Install from url: $artifact_url
# Define common functions # Define common functions

2
docker/.env
View File

@ -1,4 +1,4 @@
APPHUB_VERSION=0.1.1 APPHUB_VERSION=0.1.2-rc1
DEPLOYMENT_VERSION=2.20.3 DEPLOYMENT_VERSION=2.20.3
GIT_VERSION=1.21.9 GIT_VERSION=1.21.9
PROXY_VERSION=2.11.3 PROXY_VERSION=2.11.3

6
docker/apphub/Dockerfile
View File

@ -1,6 +1,6 @@
# This file can running at actions # This file can running at actions
# MEDIA_VERSION and LIBRARY_VERSION will trigger its release # 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 FROM python:3.10-slim-bullseye
@ -12,12 +12,12 @@ WORKDIR /websoft9
ARG MEDIA_VERSION="0.1.1" ARG MEDIA_VERSION="0.1.1"
ARG LIBRARY_VERSION="0.7.1" ARG LIBRARY_VERSION="0.7.1"
ARG WEBSOFT9_REPO="https://github.com/Websoft9/websoft9" 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 LIBRARY_REPO="https://github.com/Websoft9/docker-library"
ARG SOURCE_GITHUB_PAGES="https://websoft9.github.io/websoft9" 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 # 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 COPY media.zip /websoft9
RUN apt update && apt install -y --no-install-recommends curl git jq cron iproute2 supervisor rsync wget unzip zip && \ RUN apt update && apt install -y --no-install-recommends curl git jq cron iproute2 supervisor rsync wget unzip zip && \

2
install/install.sh
View File

@ -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_yum="git curl wget yum-utils jq bc unzip inotify-tools"
export tools_apt="git curl wget jq bc unzip inotify-tools" export tools_apt="git curl wget jq bc unzip inotify-tools"
export docker_network="websoft9" 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 # export OS release environments
if [ -f /etc/os-release ]; then if [ -f /etc/os-release ]; then
. /etc/os-release . /etc/os-release

2
install/install_plugins.sh
View File

@ -44,7 +44,7 @@ echo "Your installation parameters are as follows: "
echo "--channel: $channel" echo "--channel: $channel"
echo "--install_path: $install_path" 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] - ' echo_prefix_plugins=$'\n[Plugins] - '
versions_local_file="$install_path/version.json" versions_local_file="$install_path/version.json"

4
scripts/install-bk.sh
View File

@ -8,10 +8,10 @@ function error_exit {
} }
trap 'error_exit "Please push issue to: https://github.com/Websoft9/stackhub/issues"' ERR 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 if [[ "$1" == "dev" ]]; then
echo "update by dev artifacts" echo "update by dev artifacts"
urls="https://w9artifact.blob.core.windows.net/dev/websoft9" urls="https://artifact.websoft9.com/dev/websoft9"
fi fi
function get_os_type() { function get_os_type() {

2
scripts/update-bk.sh
View File

@ -8,7 +8,7 @@ function error_exit {
} }
trap 'error_exit "Please push issue to: https://github.com/Websoft9/websoft9/issues"' ERR 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(){ CheckEnv(){
echo "------------------ Welcome to update websoft9's appstore, it will take 1-3 minutes -----------------" echo "------------------ Welcome to update websoft9's appstore, it will take 1-3 minutes -----------------"

2
scripts/update_zip.sh
View File

@ -48,7 +48,7 @@ if [ -z "$package_name" ] || [ -z "$sync_to" ]; then
fi fi
# Define the artifact URL as a global variable # 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() { upgrade_zip() {

2
version.json
View File

@ -1,5 +1,5 @@
{ {
"version": "2.1.12-rc4", "version": "2.1.12-rc1",
"plugins": { "plugins": {
"portainer": "0.1.2", "portainer": "0.1.2",
"nginx": "0.0.9", "nginx": "0.0.9",