From 3f9ae7baf9d92d4af63554f544c2c6b09d4daf6a Mon Sep 17 00:00:00 2001 From: Bibo Hao Date: Thu, 27 Nov 2025 11:32:50 +0000 Subject: [PATCH 1/2] update openresty docs --- docker_casdoor/work/script-setup-casdoor.sh | 2 +- docker_openresty/README.md | 25 +++++++++++++++++---- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/docker_casdoor/work/script-setup-casdoor.sh b/docker_casdoor/work/script-setup-casdoor.sh index c89d097..1855218 100644 --- a/docker_casdoor/work/script-setup-casdoor.sh +++ b/docker_casdoor/work/script-setup-casdoor.sh @@ -24,7 +24,7 @@ setup_casdoor() { # && go test -v -run TestGetVersionInfo ./util/system_test.go ./util/system.go > version_info.txt \ echo "--> Building Frontend..." \ - && cd /tmp && corepack enable && yarn -v \ + && cd /tmp && npm install -g yarn && yarn -v \ && cd /tmp/casdoor/web \ && yarn set version berry && yarn install && yarn run build \ && mv ./build*/* /opt/casdoor/web/build/ diff --git a/docker_openresty/README.md b/docker_openresty/README.md index c181d8f..5e0b7fc 100644 --- a/docker_openresty/README.md +++ b/docker_openresty/README.md @@ -5,12 +5,21 @@ What's here: - acme.sh - lego -## Debug +## How to apply for certificates using ACME.sh -```shell -docker run -it --rm labnow/base bash +```bash +# docker exec -it svc-proxy-openresty bash (enter into the container) -docker build -t openresty --build-arg BASE_NAMESPACE=labnow . +cd /etc/nginx/ssl && ls -alh + +# If you don't have any certs yet, set your DOMAIN list to DOMAINS +DOMAINS='a1.example.com a2.example.com a3.example.com' + +# If you already have certs in this folder, run the command below to get a list of DOMAINS +DOMAINS=$(printf "%s\n" *.crt *.key 2>/dev/null | sed 's/\.[^.]*$//' | sort -u) + + +/opt/utils/script-acme-sh.sh 'your@email.com' "${DOMAINS}" ``` ## Custom Configs @@ -29,3 +38,11 @@ You can add your custom configuration snippet files at /data/nginx/custom as fol - `conf/server_stream.conf`: Included at the end of every stream server block - `conf/server_stream_tcp.conf`: Included at the end of every TCP stream server block - `conf/server_stream_udp.conf`: Included at the end of every UDP stream server block + +## Debug + +```bash +docker run -it --rm labnow/openresty bash + +docker build -t openresty --build-arg BASE_NAMESPACE=labnow . +``` From 73c267839a847930c683e27e4830325fa6b2429d Mon Sep 17 00:00:00 2001 From: Bibo Hao Date: Thu, 27 Nov 2025 11:37:29 +0000 Subject: [PATCH 2/2] update keycload ver --- docker_keycloak/work/script-setup-keycloak.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker_keycloak/work/script-setup-keycloak.sh b/docker_keycloak/work/script-setup-keycloak.sh index 5296ce2..2e5c333 100644 --- a/docker_keycloak/work/script-setup-keycloak.sh +++ b/docker_keycloak/work/script-setup-keycloak.sh @@ -2,7 +2,7 @@ source /opt/utils/script-utils.sh setup_keycloak() { # Install the latest (but not nightly) version of keycloak - VER_KEYCLOAK_MAJOR="26.3" \ + VER_KEYCLOAK_MAJOR="26" \ && VER_KEYCLOAK=$(curl -sL https://github.com/keycloak/keycloak/releases.atom | grep 'releases/tag' | grep -v nightly | grep "${VER_KEYCLOAK_MAJOR}" | head -1 | grep -Po '\d[\d.]+' ) \ && URL_KEYCLOAK="https://github.com/keycloak/keycloak/releases/download/$VER_KEYCLOAK/keycloak-$VER_KEYCLOAK.tar.gz" \ && echo "Downloading Keycloak version ${VER_KEYCLOAK} from: ${URL_KEYCLOAK}" \