Merge branch 'main' into dev/update-casdoor-code

Author: haobibo

.github/workflows/build-docker.yml

@@ -25,6 +25,7 @@ env:
   # used to sync image to mirror registry
   DOCKER_MIRROR_REGISTRY_USERNAME: ${{ vars.DOCKER_MIRROR_REGISTRY_USERNAME }}
   DOCKER_MIRROR_REGISTRY_PASSWORD: ${{ secrets.DOCKER_MIRROR_REGISTRY_PASSWORD }}
+  CI_PROJECT_NAME: ${{ vars.CI_PROJECT_NAME || 'LabNow/lab-dev' }}
 
 jobs:
   ## Clash
@@ -55,7 +56,7 @@ jobs:
           source ./tool.sh && build_image keycloak latest docker_keycloak/Dockerfile && push_image
 
   ## DevHub
-  qpod_dev-hub:
+  job-dev-hub:
     name: 'dev-hub'
     runs-on: ubuntu-latest
     steps:
@@ -68,7 +69,7 @@ jobs:
           push_image
 
   ## OpenResty as gateway
-  qpod_openresty:
+  job-openresty:
     name: 'openresty'
     runs-on: ubuntu-latest
     steps:
@@ -77,7 +78,7 @@ jobs:
           source ./tool.sh && build_image openresty latest docker_openresty/Dockerfile && push_image
 
   ## OpenResty as gateway
-  qpod_searxng:
+  job-searxng:
     name: 'searxng'
     runs-on: ubuntu-latest
     steps:
@@ -87,7 +88,7 @@ jobs:
 
 
   ## DevBox - base
-  qpod_base-dev:
+  job-base-dev:
     name: 'developer,base-dev'
     runs-on: ubuntu-latest
     steps:
@@ -101,7 +102,7 @@ jobs:
           alias_image base-dev latest developer latest && push_image dev
 
   ## DevBox - data science stack
-  qpod_data-science-dev:
+  job-data-science-dev:
     name: 'data-science-dev'
     runs-on: ubuntu-latest
     steps:
@@ -116,7 +117,7 @@ jobs:
           push_image
 
   ## DevBox - full stack
-  qpod_full-stack-dev:
+  job-full-stack-dev:
     name: 'full-stack-dev'
     runs-on: ubuntu-latest
     steps:
@@ -131,7 +132,7 @@ jobs:
           push_image
 
   ## DevBox - cuda
-  qpod_cuda-dev:
+  job-cuda-dev:
     name: 'full-cuda,cuda-dev'
     runs-on: ubuntu-latest
     steps:
@@ -147,7 +148,7 @@ jobs:
 
   ## Sync all images in this build (listed by "names") to mirror registry.
   sync_images:
-    needs: ["qpod_cuda-dev", "qpod_data-science-dev", "qpod_full-stack-dev"]
+    needs: ["job-cuda-dev", "job-data-science-dev", "job-full-stack-dev"]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -158,5 +159,5 @@ jobs:
           source ./tool.sh
           printf '%s' "$AUTH_FILE_CONTENT" > .github/workflows/auth.json && ls -alh ./.github/workflows
           printenv | grep -v 'PATH' > /tmp/docker.env && echo "REGISTRY_URL=${REGISTRY_DST}" >> /tmp/docker.env
-          docker run --rm --env-file /tmp/docker.env -v $(pwd):/tmp -w /tmp ${IMG_PREFIX_DST:-qpod}/docker-kit \
+          docker run --rm --env-file /tmp/docker.env -v $(pwd):/tmp -w /tmp ${IMG_PREFIX_DST:-labnow}/docker-kit \
             python /opt/utils/image-syncer/run_jobs.py --auth-file=/tmp/.github/workflows/auth.json

LICENSE

@@ -1,6 +1,7 @@
 BSD 3-Clause License
 
-Copyright (c) 2024, QPod
+Copyright (c) 2018, QPod
+Copyright (c) 2024, LabNow
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:

README.md

@@ -1,46 +1,40 @@
-# QPod Lab Dev - Docker Image Stack
+# LabNow Container Image Stack - Lab Dev
 
 [![License](https://img.shields.io/badge/License-BSD%203--Clause-green.svg)](https://opensource.org/licenses/BSD-3-Clause)
-[![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/QPod/lab-dev/build-docker.yml?branch=main)](https://github.com/QPod/lab-dev/actions/workflows/build-docker.yml)
-[![Recent Code Update](https://img.shields.io/github/last-commit/QPod/lab-dev.svg)](https://github.com/QPod/lab-dev/stargazers)
-[![Visit Images on DockerHub](https://img.shields.io/badge/DockerHub-Images-green)](https://hub.docker.com/u/qpod)
+[![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/LabNow-ai/lab-dev/build-docker.yml?branch=main)](https://github.com/LabNow-ai/lab-dev/actions/workflows/build-docker.yml)
+[![Recent Code Update](https://img.shields.io/github/last-commit/LabNow-ai/lab-dev.svg)](https://github.com/LabNow-ai/lab-dev/stargazers)
+[![Visit Images on DockerHub](https://img.shields.io/badge/DockerHub-Images-green)](https://hub.docker.com/u/labnow)
 
-Please generously STAR★ our project or donate to us!  [![GitHub Starts](https://img.shields.io/github/stars/QPod/lab-dev.svg?label=Stars&style=social)](https://github.com/QPod/lab-dev/stargazers)
+Please generously STAR★ our project or donate to us!  [![GitHub Starts](https://img.shields.io/github/stars/LabNow-ai/lab-dev.svg?label=Stars&style=social)](https://github.com/LabNow-ai/lab-dev/stargazers)
 [![Donate-PayPal](https://img.shields.io/badge/Donate-PayPal-blue.svg)](https://paypal.me/haobibo)
 [![Donate-AliPay](https://img.shields.io/badge/Donate-Alipay-blue.svg)](https://raw.githubusercontent.com/wiki/haobibo/resources/img/Donate-AliPay.png)
 [![Donate-WeChat](https://img.shields.io/badge/Donate-WeChat-green.svg)](https://raw.githubusercontent.com/wiki/haobibo/resources/img/Donate-WeChat.png)
 
 Discussion and contributions are welcome:
 [![Join the Discord Chat](https://img.shields.io/badge/Discuss_on-Discord-green)](https://discord.gg/kHUzgQxgbJ)
-[![Open an Issue on GitHub](https://img.shields.io/github/issues/QPod/lab-dev)](https://github.com/QPod/lab-dev/issues)
+[![Open an Issue on GitHub](https://img.shields.io/github/issues/LabNow-ai/lab-dev)](https://github.com/LabNow-ai/lab-dev/issues)
 
 ## Lab Dev - Building Blocks and IDEs for Application Development
 
-`QPod lab-dev` ( [DockerHub](https://hub.docker.com/u/qpod) | [GitHub](https://github.com/QPod/lab-dev) ) provides Building Blocks and IDEs for Application Development.
+`LabNow lab-dev` ( [DockerHub](https://hub.docker.com/u/labnow) | [GitHub](https://github.com/LabNow-ai/lab-dev) ) provides Building Blocks and IDEs for Application Development.
 
 ## Documentation & Tutorial
 
-[Wiki & Document](https://qpod.github.io/) | [中文使用指引(含中国网络镜像)](https://qpod.github.io/docs/intro-cn)
-
-## Screenshot and Arch Diagram
-
-![Screenshot of QPod](https://raw.githubusercontent.com/wiki/QPod/qpod-hub/img/QPod-screenshot.webp "Screenshot of QPod")
-
-![Arch Diagram for QPod DevBox](https://raw.githubusercontent.com/wiki/QPod/docker-images/img/QPod-arch.svg "Arch Diagram for QPod DevBox")
+[Wiki & Document](https://labnow.ai/) | [中文使用指引(含中国网络镜像)](https://labnow-ai.feishu.cn/wiki/wikcn0sBhMtb1KNRSUTettxWstc)
 
 ## Develop and Debug
 
 ```bash
-IMG="qpod/developer"
-# IMG="registry.cn-hangzhou.aliyuncs.com/qpod/developer"
+IMG="labnow/developer"
+# IMG="quay.io/labnow/developer"
 
 docker run -d --restart=always \
-    --name=QPod-lab-dev \
-    --hostname=QPod \
+    --name=labnow-dev \
+    --hostname=LabNow \
     -p 18888-18890:8888-8890 \
-    -v $(pwd):/root/lab-dev \
-    -w /root/lab-dev \
+    -v $(pwd):/root/labnow \
+    -w /root/labnow \
     $IMG
 
-sleep 5s && docker logs QPod-lab-dev 2>&1|grep token=
+sleep 5s && docker logs labnow-dev 2>&1|grep token=
 ```

docker_app_clash/README.md

@@ -11,7 +11,7 @@ docker run -d \
     --name=app-clash \
     -p 7890:7890 -p 9090:9090 \
     -e PROXY_PROVIDER="https://subs.zeabur.app/clash" \
-    qpod/app-clash
+    labnow/app-clash
 ```
 
 After the container starts, visit this page to manage proxy: http://localhost:9090/ui/ui-xd/

docker_app_clash/clash.Dockerfile

@@ -6,12 +6,12 @@ ARG BASE_IMG="atom"
 
 
 # Stage 1: build code, both backend and frontend
-FROM ${BASE_NAMESPACE:+$BASE_NAMESPACE/}${BASE_IMG_BUILD} as builder
+FROM ${BASE_NAMESPACE:+$BASE_NAMESPACE/}${BASE_IMG_BUILD} AS builder
 
 COPY work/clash /opt/utils/
 
 RUN set -eux && source /opt/utils/script-setup-clash.sh \
- && setup_clash && setup_clash_metacubexd && setup_clash_verge \
+ && setup_clash && setup_clash_metacubexd && setup_clash_zashboard \
  && mv /opt/utils/config.yaml    /opt/clash/config \
  && mv /opt/utils/start-clash.sh /opt/clash/
 

docker_app_clash/demo/docker-compose.yml

@@ -1,6 +1,6 @@
 services:
   svc-clash:
-    image: docker.io/qpod/app-clash
+    image: docker.io/labnow/app-clash
     container_name: svc-clash
     hostname: svc-clash
     restart: unless-stopped

docker_app_clash/work/clash/script-setup-clash.sh

@@ -34,14 +34,14 @@ setup_clash_metacubexd() {
   && mv /tmp/xd/dist /opt/clash/ui-xd
 }
 
-setup_clash_verge() {
-    #  Install the latest release: https://clash-verge-rev.github.io/index.html
-     VER_VERGE=$(curl -sL https://github.com/clash-verge-rev/clash-verge-rev/releases.atom | grep 'releases/tag/v' | head -1 | grep -Po '\d[\d.]+' ) \
-  && URL_VERGE="https://github.com/clash-verge-rev/clash-verge-rev/archive/refs/tags/v$VER_VERGE.tar.gz" \
-  && echo "Downloading clash-verge version ${VER_VERGE} from: ${URL_VERGE}" \
-  && install_tar_gz $URL_VERGE \
-  && mv /opt/clash-verge-* /tmp/verge && cd /tmp/verge \
+setup_clash_zashboard() {
+    #  Install the latest release: https://github.com/Zephyruso/zashboard
+     VER_ZASHBOARD=$(curl -sL https://github.com/Zephyruso/zashboard/releases.atom | grep 'releases/tag/v' | head -1 | grep -Po '\d[\d.]+' ) \
+  && URL_ZASHBOARD="https://github.com/Zephyruso/zashboard/archive/refs/tags/v$VER_ZASHBOARD.tar.gz" \
+  && echo "Downloading zashboard version ${VER_ZASHBOARD} from: ${URL_ZASHBOARD}" \
+  && install_tar_gz $URL_ZASHBOARD \
+  && mv /opt/zashboard-* /tmp/zashboard && cd /tmp/zashboard \
   && jq '.homepage = "./ui"' package.json > tmp.$$.json && mv tmp.$$.json package.json \
-  && npx pnpm i && npx pnpm run web:build && ls -alh \
-  && mv /tmp/verge/dist /opt/clash/ui-verge
+  && npx pnpm i && npx pnpm run build && ls -alh \
+  && mv /tmp/zashboard/dist /opt/clash/ui-zashboard
 }

docker_casdoor/Dockerfile

@@ -22,7 +22,7 @@ RUN set -eux \
  && mkdir -pv /root/web && ln -sf /opt/casdoor/web/build /root/web/ && ls -alh /opt/casdoor/web \
  && chmod +x /opt/casdoor/docker-entrypoint.sh && ls -alh /opt/casdoor
 
-LABEL maintainer="haobibo@gmail.com"
+LABEL maintainer="postmaster@labnow.ai"
 ENV RUNNING_IN_DOCKER true
 WORKDIR /opt/casdoor
 EXPOSE 8000

docker_casdoor/README.md

@@ -5,20 +5,20 @@ Identity and Access Management (IAM) / Single-Sign-On (SSO) platform: https://gi
 ## debug
 
 ```shell
-docker build -t qpod0dev/casdoor \
+docker build -t labnow/casdoor \
     -f docker_casdoor/Dockerfile \
-    --build-arg="BASE_NAMESPACE=qpod0dev" \
+    --build-arg="BASE_NAMESPACE=labnow" \
     docker_casdoor
 
 docker run -it \
     -p 8000:8000 \
-    qpod0dev/casdoor \
+    labnow/casdoor \
     bash
 
 
 docker run --rm -it \
     -p 8000:8000 \
     -v $(pwd):/root/docker_casdoor \
-    qpod/go-stack \
+    labnow/go-stack \
     bash
 ```

docker_casdoor/demo/docker-compose.dev.yml

@@ -1,7 +1,7 @@
 services:
   db-postgres-casdoor:
       # su postgres && psql -d casdoor -U pg-casdoor-username
-      image: docker.io/qpod/postgres-16:latest
+      image: docker.io/labnow/postgres-16:latest
       container_name: db-postgres
       environment:
         POSTGRES_DB: casdoor
@@ -13,9 +13,9 @@ services:
         context: ../
         dockerfile: Dockerfile
         args:
-          BASE_NAMESPACE: qpod
+          BASE_NAMESPACE: labnow
         tags:
-         - qpod/casdoor
+         - labnow/casdoor
       container_name: svc-casdoor
       # command: ["/bin/bash", "--login", "/opt/casdoor/server", "--createDatabase=true"]
       command: |