Merge branch 'dev' into main

Dev

.github/workflows/docker.yml

@@ -11,7 +11,7 @@ name: Build image to DockerHub
 
 on:
   push:
-    branches: [main]
+    branches: [main, dev]  # Include dev branch
     paths:
       - "docker/*/Dockerfile"
 
@@ -38,8 +38,7 @@ jobs:
     needs: setup
     runs-on: ubuntu-latest
     env:
-      # You can set it to choice where download from 
-      MEDIA_FROM: "source"
+      MEDIA_FROM: "source"  # You can set it to choice where download from 
     strategy:
       matrix: ${{fromJson(needs.setup.outputs.matrix)}}
     steps:
@@ -53,23 +52,31 @@ jobs:
           APP=${{ matrix.app }}
           TAG=$(grep 'LABEL version' "docker/$APP/Dockerfile" | cut -d'"' -f2 | xargs)
           echo $APP version is $TAG
-          if [[ "$TAG" == *"-"* ]]; then
-            TAGS="$TAG"
+          
+          # Determine the channel based on the branch and TAG
+          if [[ $GITHUB_REF == *"refs/heads/dev"* ]]; then
             echo "CHANNEL=dev" >> $GITHUB_ENV
+            TAGS="$TAG"  # Use the TAG directly for dev
           else
-            echo "CHANNEL=release" >> $GITHUB_ENV
-            IFS='.' read -ra PARTS <<< "$TAG"
-            TAGS="latest"
-            TAG_PART=""
-            for i in "${!PARTS[@]}"; do 
-              if [ "$i" -eq 0 ]; then 
-                TAG_PART="${PARTS[$i]}"
-              else 
-                TAG_PART="${TAG_PART}.${PARTS[$i]}"
-              fi
-              TAGS="${TAGS},${TAG_PART}"
-            done
+            if [[ "$TAG" == *"-"* ]]; then
+              echo "CHANNEL=rc" >> $GITHUB_ENV
+              TAGS="$TAG"
+            else
+              echo "CHANNEL=release" >> $GITHUB_ENV
+              IFS='.' read -ra PARTS <<< "$TAG"
+              TAGS="latest"
+              TAG_PART=""
+              for i in "${!PARTS[@]}"; do 
+                if [ "$i" -eq 0 ]; then 
+                  TAG_PART="${PARTS[$i]}"
+                else 
+                  TAG_PART="${TAG_PART}.${PARTS[$i]}"
+                fi
+                TAGS="${TAGS},${TAG_PART}"
+              done
+            fi
           fi
+          
           echo "Building and pushing Docker image for $APP with tags: $TAGS"
           echo "TAGS=$TAGS" >> $GITHUB_ENV
           echo "APP=$APP" >> $GITHUB_ENV
@@ -159,4 +166,4 @@ jobs:
           password: ${{ secrets.DOCKER_PASSWORD }}
           repository: websoft9dev/${{env.APP}}
           readme-filepath: ${{env.README}}
-        if: needs.setup.outputs.matrix != ''
+        if: needs.setup.outputs.matrix != ''

.github/workflows/release.yml

@@ -5,6 +5,7 @@ on:
   push:
     branches:
       - main
+      - dev
     paths:
       - "version.json"
 
@@ -24,9 +25,13 @@ jobs:
           version_core=${version%%-*}
           echo "VERSION=$version" >> $GITHUB_OUTPUT
           echo "VERSION_CORE=$version_core" >> $GITHUB_OUTPUT
-          if [[ $version == *-* ]]; then
-            echo "rc release version"
+          
+          if [[ $GITHUB_REF == *"refs/heads/dev"* ]]; then
+            echo "dev branch detected"
             echo "CHANNEL=dev" >> $GITHUB_OUTPUT
+          elif [[ $version == *-* ]]; then
+            echo "rc release version"
+            echo "CHANNEL=rc" >> $GITHUB_OUTPUT
           else
             echo "release version"
             echo "CHANNEL=release" >> $GITHUB_OUTPUT
@@ -71,6 +76,7 @@ jobs:
           destination-dir: ./${{ steps.convert_version.outputs.CHANNEL }}/websoft9
 
       - name: Create Github Release
+        if: github.ref == 'refs/heads/main'  # 仅在 main 分支上触发
         uses: softprops/action-gh-release@v1
         with:
           files: |
@@ -84,6 +90,7 @@ jobs:
 
   pages:
     name: Build Github Pages
+    if: github.ref == 'refs/heads/main'  # 仅在 main 分支上触发
     permissions:
       contents: read
       pages: write

README.md

@@ -62,7 +62,6 @@ Need root privileges user to install Websoft9, if you use no-root user you can `
 # Install by default
 wget -O install.sh https://websoft9.github.io/websoft9/install/install.sh && bash install.sh
 
-
 # Install Websoft9 with parameters
 wget -O install.sh https://websoft9.github.io/websoft9/install/install.sh && bash install.sh --port 9000 --channel release --path "/data/websoft9/source" --version "latest"
 ```

apphub/src/config/config.ini

@@ -1,7 +1,7 @@
 [nginx_proxy_manager]
 base_url = http://websoft9-proxy:81/api
 user_name = admin@mydomain.com
-user_pwd = 9KCRwcL10saLCGaZ
+user_pwd = LMFuCnajkQhK3zeb
 nike_name = admin
 listen_port = 443
 
@@ -9,18 +9,18 @@ listen_port = 443
 base_url = http://websoft9-git:3000/api/v1
 user_name = websoft9
 user_email = admin@mydomain.com
-user_pwd = kk95qed0Fxt8
+user_pwd = 93HDu6tUWeGx
 
 [portainer]
 base_url = http://websoft9-deployment:9000/api
 user_name = admin
-user_pwd = FptfbwA1TpUr
+user_pwd = 93sX)LLHKJY$
 
 [api_key]
 key = cc9223b3055471a6f4f9654e08371816a9637ba1c57383617b0684b92ac7b2f4
 
 [domain]
-wildcard_domain = 
+wildcard_domain =
 
 [cockpit]
 port = 9000

apphub/src/services/app_manager.py

@@ -429,15 +429,17 @@ class AppManger:
 
             # Verify the app is web app
             is_web_app = envHelper.get_value("W9_URL")
-            url_with_port = envHelper.get_value("W9_URL_WITH_PORT")
+            # url_with_port = envHelper.get_value("W9_URL_WITH_PORT")
+            w9_url_with_replace = envHelper.get_value("W9_URL_REPLACE")
 
             if is_web_app is not None:
-                if url_with_port is None:
+                if w9_url_with_replace is None:
                     envHelper.set_value("W9_URL", domain_names[0])
                 else:
                     try:
                         ipaddress.ip_address(domain_names[0])
-                        envHelper.set_value("W9_URL", domain_names[0] + ":" + envHelper.get_value("W9_HTTP_PORT_SET"))
+                        #envHelper.set_value("W9_URL", domain_names[0] + ":" + envHelper.get_value("W9_HTTP_PORT_SET"))
+                        envHelper.set_value("W9_URL", domain_names[0] + ":" + (envHelper.get_value("W9_HTTP_PORT_SET") or envHelper.get_value("W9_HTTPS_PORT_SET")))
                     except ValueError:
                         envHelper.set_value("W9_URL", domain_names[0])
 
@@ -1100,7 +1102,7 @@ class AppManger:
                     # Get the w9_url and w9_url_replace
                     w9_url_replace = next((element.get("w9_url_replace") for element in app_info.domain_names if element.get("id") == proxy_id), None)
                     w9_url = next((element.get("w9_url") for element in app_info.domain_names if element.get("id") == proxy_id), None)
-                    
+
                     # validate w9_url_replace is true
                     if w9_url_replace:
                         domain_names = host.get("domain_names",None)
@@ -1111,7 +1113,8 @@ class AppManger:
                             if w9_url in domain_names:
                                 new_w9_url = None
                                 if len(app_proxys) == 1 and app_proxys[0].get("id") == proxy_id:
-                                    new_w9_url = client_host
+                                    # 如果w9_url_with_port存在，并且值为: true
+                                        new_w9_url = client_host+":"+ (app_info.env.get("W9_HTTP_PORT_SET") or app_info.env.get("W9_HTTPS_PORT_SET"))
                                 elif len(app_proxys) > 1:
                                     # Get the first proxy_host
                                     proxy_host = next((proxy for proxy in app_proxys if proxy.get("id") != proxy_id), None)

docker/.env

@@ -1,4 +1,4 @@
-APPHUB_VERSION=0.1.8
+APPHUB_VERSION=0.1.9
 DEPLOYMENT_VERSION=2.20.3
 GIT_VERSION=1.21.9
-PROXY_VERSION=2.11.3
+PROXY_VERSION=2.11.3

docker/apphub/Dockerfile

@@ -1,11 +1,11 @@
 # This file can running at actions
 # MEDIA_VERSION and LIBRARY_VERSION will trigger its release
-# modify time: 202412251101, you can modify here to trigger Docker Build action
+# modify time: 202501021450, you can modify here to trigger Docker Build action
 
 
 FROM python:3.10-slim-bullseye
 LABEL maintainer="Websoft9<help@websoft9.com>"
-LABEL version="0.1.8"
+LABEL version="0.1.9"
 
 WORKDIR  /websoft9
 

install/install.sh

@@ -18,7 +18,7 @@ export PATH
 #
 #   $ sudo bash install.sh --port 9001
 #
-# --channel <release|dev>
+# --channel <release|rc|dev>
 # Use the --channel option to install a release(production) or dev distribution. default is release, for example:
 #
 #  $ sudo bash install.sh --channel release

version.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.1.19-rc1",
+  "version": "2.1.20",
   "plugins": {
     "portainer": "0.1.3",
     "nginx": "0.1.0",
@@ -11,8 +11,8 @@
   },
   "OS": {
     "Fedora": [
-      "40",
-      "39"
+      "41",
+      "40"
     ],
     "RedHat": [
       "9",