From 6aa5be83ec2d2e7a9dc0e8aa9ce9186e380636c5 Mon Sep 17 00:00:00 2001 From: Bibo Hao Date: Thu, 10 Apr 2025 18:44:06 +0800 Subject: [PATCH] fix casdoor build --- docker_casdoor/Dockerfile | 1 + docker_casdoor/work/script-setup-casdoor.sh | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docker_casdoor/Dockerfile b/docker_casdoor/Dockerfile index 183ec78..9aa98e9 100644 --- a/docker_casdoor/Dockerfile +++ b/docker_casdoor/Dockerfile @@ -18,6 +18,7 @@ FROM ${BASE_NAMESPACE:+$BASE_NAMESPACE/}${BASE_IMG} COPY --from=builder /opt/casdoor /opt/casdoor COPY work/app.conf /opt/casdoor/conf/app.conf RUN set -eux \ + && apt-get -qq update -yq --fix-missing && apt-get -qq install -yq --no-install-recommends lsof \ && 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 diff --git a/docker_casdoor/work/script-setup-casdoor.sh b/docker_casdoor/work/script-setup-casdoor.sh index 92cf209..e908121 100644 --- a/docker_casdoor/work/script-setup-casdoor.sh +++ b/docker_casdoor/work/script-setup-casdoor.sh @@ -9,7 +9,7 @@ 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 /opt/casdoor/conf + && mv /opt/casdoor-* /tmp/casdoor && mkdir -pv /opt/casdoor/web/build /opt/casdoor/conf echo "--> Building Backend..." \ && cd /tmp/casdoor && ./build.sh \ @@ -24,7 +24,7 @@ setup_casdoor() { && cd /tmp && corepack enable && yarn -v \ && cd /tmp/casdoor/web \ && yarn set version berry && yarn install && yarn run build \ - && mv ./build*/* /opt/casdoor/web/ + && mv ./build*/* /opt/casdoor/web/build/ # && yarn install --frozen-lockfile && yarn run build \ echo "--> Finished building casdoor to /opt/casdoor!" \