Merge branch 'dev' of https://github.com/Websoft9/websoft9 into 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"  # You can set it to choice where download from 
-      MEDIA_FROM: "source"
     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
+            if [[ "$TAG" == *"-"* ]]; then
-            IFS='.' read -ra PARTS <<< "$TAG"
+              echo "CHANNEL=rc" >> $GITHUB_ENV
-            TAGS="latest"
+              TAGS="$TAG"
-            TAG_PART=""
+            else
-            for i in "${!PARTS[@]}"; do 
+              echo "CHANNEL=release" >> $GITHUB_ENV
-              if [ "$i" -eq 0 ]; then 
+              IFS='.' read -ra PARTS <<< "$TAG"
-                TAG_PART="${PARTS[$i]}"
+              TAGS="latest"
-              else 
+              TAG_PART=""
-                TAG_PART="${TAG_PART}.${PARTS[$i]}"
+              for i in "${!PARTS[@]}"; do 
-              fi
+                if [ "$i" -eq 0 ]; then 
-              TAGS="${TAGS},${TAG_PART}"
+                  TAG_PART="${PARTS[$i]}"
-            done
+                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
@@ -112,6 +119,7 @@ jobs:
           repository: websoft9/docker-library
           event-type: custom_event
           token: ${{secrets.MYGITHUB_ADMIN_TOKEN}}
+          ref: ${{ github.ref }}
         if: env.APP == 'apphub'
       
         # release media step1

.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

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: 202412291229, 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-dev"
 
 WORKDIR  /websoft9
 

version.json

@@ -11,8 +11,8 @@
   },
   "OS": {
     "Fedora": [
-      "40",
+      "41",
-      "39"
+      "40"
     ],
     "RedHat": [
       "9",