From 91441360ef4d65eaba728c2e49cbaec2ceccf6a3 Mon Sep 17 00:00:00 2001 From: Xiang Ye Date: Mon, 30 Jun 2025 16:37:03 +0800 Subject: [PATCH 01/11] update code --- docker_casdoor/work/script-setup-casdoor.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docker_casdoor/work/script-setup-casdoor.sh b/docker_casdoor/work/script-setup-casdoor.sh index e908121..99d7dbd 100644 --- a/docker_casdoor/work/script-setup-casdoor.sh +++ b/docker_casdoor/work/script-setup-casdoor.sh @@ -9,7 +9,10 @@ setup_casdoor() { && URL_CASDOOR="https://github.com/casdoor/casdoor/archive/refs/tags/v${VER_CASDOOR}.tar.gz" \ && echo "Downloading casdoor version ${VER_CASDOOR} from: ${URL_CASDOOR}" \ && install_tar_gz $URL_CASDOOR \ - && mv /opt/casdoor-* /tmp/casdoor && mkdir -pv /opt/casdoor/web/build /opt/casdoor/conf + && mv /opt/casdoor-* /tmp/casdoor \ + && sed -i '311i c.SetSessionUsername(user.GetId())' /tmp/casdoor/controllers/account.go \ + && sed -i 's|^[[:space:]]*if paidUserName != "" && paidUserName != c.GetSessionUsername() && !c.IsAdmin() {| if paidUserName != "" && userId != c.GetSessionUsername() && !c.IsAdmin() {|' /tmp/casdoor/controllers/product.go + && mkdir -pv /opt/casdoor/web/build /opt/casdoor/conf \ echo "--> Building Backend..." \ && cd /tmp/casdoor && ./build.sh \ From 91b0f56b78694326070b14d5d01224ca0fa45b42 Mon Sep 17 00:00:00 2001 From: Bibo Hao Date: Mon, 30 Jun 2025 16:45:31 +0800 Subject: [PATCH 02/11] Update tool.sh --- tool.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tool.sh b/tool.sh index 4988560..0a1b560 100644 --- a/tool.sh +++ b/tool.sh @@ -1,7 +1,7 @@ #!/bin/bash set -xu -CI_PROJECT_NAME=${GITHUB_REPOSITORY:-"QPod/lab-dev"} +CI_PROJECT_NAME="QPod/lab-dev" # ${GITHUB_REPOSITORY:-"QPod/lab-dev"} CI_PROJECT_BRANCH=${GITHUB_HEAD_REF:-"main"} CI_PROJECT_SPACE=$(echo "${CI_PROJECT_BRANCH}" | cut -f1 -d'/') From 364070c5f2e47c6ae2c6333fdfdacbcc213e5fa0 Mon Sep 17 00:00:00 2001 From: Xiang Ye Date: Mon, 30 Jun 2025 16:55:39 +0800 Subject: [PATCH 03/11] fix: add missing newline characters --- docker_casdoor/work/script-setup-casdoor.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker_casdoor/work/script-setup-casdoor.sh b/docker_casdoor/work/script-setup-casdoor.sh index 99d7dbd..172de0f 100644 --- a/docker_casdoor/work/script-setup-casdoor.sh +++ b/docker_casdoor/work/script-setup-casdoor.sh @@ -11,7 +11,7 @@ setup_casdoor() { && install_tar_gz $URL_CASDOOR \ && mv /opt/casdoor-* /tmp/casdoor \ && sed -i '311i c.SetSessionUsername(user.GetId())' /tmp/casdoor/controllers/account.go \ - && sed -i 's|^[[:space:]]*if paidUserName != "" && paidUserName != c.GetSessionUsername() && !c.IsAdmin() {| if paidUserName != "" && userId != c.GetSessionUsername() && !c.IsAdmin() {|' /tmp/casdoor/controllers/product.go + && sed -i 's|^[[:space:]]*if paidUserName != "" && paidUserName != c.GetSessionUsername() && !c.IsAdmin() {| if paidUserName != "" && userId != c.GetSessionUsername() && !c.IsAdmin() {|' /tmp/casdoor/controllers/product.go \ && mkdir -pv /opt/casdoor/web/build /opt/casdoor/conf \ echo "--> Building Backend..." \ From 41452f352db1a2fbff9d36bd7048a939671abd3f Mon Sep 17 00:00:00 2001 From: Bibo Hao Date: Mon, 30 Jun 2025 17:02:42 +0800 Subject: [PATCH 04/11] Update searxng.Dockerfile --- docker_searxng/searxng.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker_searxng/searxng.Dockerfile b/docker_searxng/searxng.Dockerfile index 3884618..c790751 100644 --- a/docker_searxng/searxng.Dockerfile +++ b/docker_searxng/searxng.Dockerfile @@ -13,7 +13,7 @@ RUN set -eux \ && adduser -uid ${SEARXNG_UID} --disabled-password --home /opt/searxng -shell /bin/bash --ingroup searxng searxng \ && usermod -aG root searxng \ && apt-get -qq update -yq --fix-missing && apt-get -qq install -yq --no-install-recommends \ - libxslt-dev zlib1g-dev libffi-dev libssl-dev \ + libxslt-dev zlib1g-dev libffi-dev libssl-dev liblzma-dev \ && pip install -U pyyaml uwsgi \ && cd /opt/searxng \ && git config --global --add safe.directory /opt/searxng \ From 014317345d41573a0be91d7b996b4323f5ad538e Mon Sep 17 00:00:00 2001 From: Xiang Ye Date: Tue, 1 Jul 2025 07:39:57 +0800 Subject: [PATCH 05/11] debug casdoor build --- docker_casdoor/work/script-setup-casdoor.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker_casdoor/work/script-setup-casdoor.sh b/docker_casdoor/work/script-setup-casdoor.sh index 172de0f..c472201 100644 --- a/docker_casdoor/work/script-setup-casdoor.sh +++ b/docker_casdoor/work/script-setup-casdoor.sh @@ -10,8 +10,8 @@ setup_casdoor() { && echo "Downloading casdoor version ${VER_CASDOOR} from: ${URL_CASDOOR}" \ && install_tar_gz $URL_CASDOOR \ && mv /opt/casdoor-* /tmp/casdoor \ - && sed -i '311i c.SetSessionUsername(user.GetId())' /tmp/casdoor/controllers/account.go \ - && sed -i 's|^[[:space:]]*if paidUserName != "" && paidUserName != c.GetSessionUsername() && !c.IsAdmin() {| if paidUserName != "" && userId != c.GetSessionUsername() && !c.IsAdmin() {|' /tmp/casdoor/controllers/product.go \ +# && sed -i '311i c.SetSessionUsername(user.GetId())' /tmp/casdoor/controllers/account.go \ +# && sed -i 's|^[[:space:]]*if paidUserName != "" && paidUserName != c.GetSessionUsername() && !c.IsAdmin() {| if paidUserName != "" && userId != c.GetSessionUsername() && !c.IsAdmin() {|' /tmp/casdoor/controllers/product.go \ && mkdir -pv /opt/casdoor/web/build /opt/casdoor/conf \ echo "--> Building Backend..." \ From f19d7edd7255086827af7061e70a0d91da245384 Mon Sep 17 00:00:00 2001 From: Xiang Ye Date: Tue, 1 Jul 2025 07:45:01 +0800 Subject: [PATCH 06/11] debug casdoor build script syntax --- docker_casdoor/work/script-setup-casdoor.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker_casdoor/work/script-setup-casdoor.sh b/docker_casdoor/work/script-setup-casdoor.sh index c472201..ea8740c 100644 --- a/docker_casdoor/work/script-setup-casdoor.sh +++ b/docker_casdoor/work/script-setup-casdoor.sh @@ -12,7 +12,7 @@ setup_casdoor() { && mv /opt/casdoor-* /tmp/casdoor \ # && sed -i '311i c.SetSessionUsername(user.GetId())' /tmp/casdoor/controllers/account.go \ # && sed -i 's|^[[:space:]]*if paidUserName != "" && paidUserName != c.GetSessionUsername() && !c.IsAdmin() {| if paidUserName != "" && userId != c.GetSessionUsername() && !c.IsAdmin() {|' /tmp/casdoor/controllers/product.go \ - && mkdir -pv /opt/casdoor/web/build /opt/casdoor/conf \ + && mkdir -pv /opt/casdoor/web/build /opt/casdoor/conf echo "--> Building Backend..." \ && cd /tmp/casdoor && ./build.sh \ From 07b2a17cf39b8099d44d260abd0f3add17e8b8f9 Mon Sep 17 00:00:00 2001 From: Xiang Ye Date: Tue, 1 Jul 2025 07:48:29 +0800 Subject: [PATCH 07/11] debug casdoor build script syntax --- docker_casdoor/work/script-setup-casdoor.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/docker_casdoor/work/script-setup-casdoor.sh b/docker_casdoor/work/script-setup-casdoor.sh index ea8740c..c010a1e 100644 --- a/docker_casdoor/work/script-setup-casdoor.sh +++ b/docker_casdoor/work/script-setup-casdoor.sh @@ -10,8 +10,6 @@ setup_casdoor() { && echo "Downloading casdoor version ${VER_CASDOOR} from: ${URL_CASDOOR}" \ && install_tar_gz $URL_CASDOOR \ && mv /opt/casdoor-* /tmp/casdoor \ -# && sed -i '311i c.SetSessionUsername(user.GetId())' /tmp/casdoor/controllers/account.go \ -# && sed -i 's|^[[:space:]]*if paidUserName != "" && paidUserName != c.GetSessionUsername() && !c.IsAdmin() {| if paidUserName != "" && userId != c.GetSessionUsername() && !c.IsAdmin() {|' /tmp/casdoor/controllers/product.go \ && mkdir -pv /opt/casdoor/web/build /opt/casdoor/conf echo "--> Building Backend..." \ From a0f7f5affb217afbe6f9a1664c7d6590fdc6a004 Mon Sep 17 00:00:00 2001 From: Xiang Ye Date: Tue, 1 Jul 2025 07:59:10 +0800 Subject: [PATCH 08/11] debug casdoor build script syntax --- docker_casdoor/work/script-setup-casdoor.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker_casdoor/work/script-setup-casdoor.sh b/docker_casdoor/work/script-setup-casdoor.sh index c010a1e..5c3baa8 100644 --- a/docker_casdoor/work/script-setup-casdoor.sh +++ b/docker_casdoor/work/script-setup-casdoor.sh @@ -10,6 +10,8 @@ setup_casdoor() { && echo "Downloading casdoor version ${VER_CASDOOR} from: ${URL_CASDOOR}" \ && install_tar_gz $URL_CASDOOR \ && mv /opt/casdoor-* /tmp/casdoor \ + && sed -i '311i c.SetSessionUsername(user.GetId())' /tmp/casdoor/controllers/account.go \ + && sed -i 's|^[[:space:]]*if paidUserName != "" && paidUserName != c.GetSessionUsername() && !c.IsAdmin() {| if paidUserName != "" && userId != c.GetSessionUsername() && !c.IsAdmin() {|' /tmp/casdoor/controllers/product.go \ && mkdir -pv /opt/casdoor/web/build /opt/casdoor/conf echo "--> Building Backend..." \ From b0c916cc60d5a04a4c947efc0911dec2da41ccb0 Mon Sep 17 00:00:00 2001 From: Xiang Ye Date: Tue, 1 Jul 2025 08:18:14 +0800 Subject: [PATCH 09/11] debug casdoor build script syntax --- docker_casdoor/work/script-setup-casdoor.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker_casdoor/work/script-setup-casdoor.sh b/docker_casdoor/work/script-setup-casdoor.sh index 5c3baa8..e0e8060 100644 --- a/docker_casdoor/work/script-setup-casdoor.sh +++ b/docker_casdoor/work/script-setup-casdoor.sh @@ -10,8 +10,8 @@ setup_casdoor() { && echo "Downloading casdoor version ${VER_CASDOOR} from: ${URL_CASDOOR}" \ && install_tar_gz $URL_CASDOOR \ && mv /opt/casdoor-* /tmp/casdoor \ - && sed -i '311i c.SetSessionUsername(user.GetId())' /tmp/casdoor/controllers/account.go \ - && sed -i 's|^[[:space:]]*if paidUserName != "" && paidUserName != c.GetSessionUsername() && !c.IsAdmin() {| if paidUserName != "" && userId != c.GetSessionUsername() && !c.IsAdmin() {|' /tmp/casdoor/controllers/product.go \ + && sed -i '/userId := user.GetId()/a\ c.SetSessionUsername(userId)' controllers/account.go \ + && sed -i 's|paidUserName != c.GetSessionUsername()|userId != c.GetSessionUsername()|' /tmp/casdoor/controllers/product.go \ && mkdir -pv /opt/casdoor/web/build /opt/casdoor/conf echo "--> Building Backend..." \ From d3bff9f537c812b542a2d0c1539fd31579f6657f Mon Sep 17 00:00:00 2001 From: Xiang Ye Date: Tue, 1 Jul 2025 08:21:57 +0800 Subject: [PATCH 10/11] debug casdoor build script syntax --- docker_casdoor/work/script-setup-casdoor.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker_casdoor/work/script-setup-casdoor.sh b/docker_casdoor/work/script-setup-casdoor.sh index e0e8060..c89d097 100644 --- a/docker_casdoor/work/script-setup-casdoor.sh +++ b/docker_casdoor/work/script-setup-casdoor.sh @@ -10,7 +10,7 @@ setup_casdoor() { && echo "Downloading casdoor version ${VER_CASDOOR} from: ${URL_CASDOOR}" \ && install_tar_gz $URL_CASDOOR \ && mv /opt/casdoor-* /tmp/casdoor \ - && sed -i '/userId := user.GetId()/a\ c.SetSessionUsername(userId)' controllers/account.go \ + && sed -i '/userId := user.GetId()/a\ c.SetSessionUsername(userId)' /tmp/casdoor/controllers/account.go \ && sed -i 's|paidUserName != c.GetSessionUsername()|userId != c.GetSessionUsername()|' /tmp/casdoor/controllers/product.go \ && mkdir -pv /opt/casdoor/web/build /opt/casdoor/conf From 3539ac1e39d785f38fb5d26727da010c8edefdf4 Mon Sep 17 00:00:00 2001 From: Bibo Hao Date: Wed, 5 Nov 2025 16:34:21 +0800 Subject: [PATCH 11/11] Use GITHUB_REPOSITORY for CI_PROJECT_NAME --- tool.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tool.sh b/tool.sh index 0a1b560..7424d58 100644 --- a/tool.sh +++ b/tool.sh @@ -1,7 +1,7 @@ #!/bin/bash set -xu -CI_PROJECT_NAME="QPod/lab-dev" # ${GITHUB_REPOSITORY:-"QPod/lab-dev"} +CI_PROJECT_NAME=${CI_PROJECT_NAME:-$GITHUB_REPOSITORY} CI_PROJECT_BRANCH=${GITHUB_HEAD_REF:-"main"} CI_PROJECT_SPACE=$(echo "${CI_PROJECT_BRANCH}" | cut -f1 -d'/')