From 72a125922dd3fca6c06d024de4d8f47ddf7c3ae7 Mon Sep 17 00:00:00 2001 From: cyjseagull Date: Thu, 12 Dec 2024 12:04:11 +0800 Subject: [PATCH] try to fix docker login --- .github/workflows/docker.yml | 9 +-------- docker-files/site/Dockerfile | 3 ++- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 672638f8..a66e2097 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -9,14 +9,7 @@ on: - 'v3.*.*' branches: - feature-milestone2 - pull_request: - paths-ignore: - - "docs/**" - - "python/**" - - "Changelog.md" - - "README.md" - types: - - closed + - main release: types: [prereleased] diff --git a/docker-files/site/Dockerfile b/docker-files/site/Dockerfile index df3dae7f..552faca1 100644 --- a/docker-files/site/Dockerfile +++ b/docker-files/site/Dockerfile @@ -66,4 +66,5 @@ COPY --from=builder /WeDPR/wedpr-site/dist/ /data/home/wedpr/wedpr-site # copy the web package COPY --from=web_builder /WeDPR/wedpr-web/dist /data/home/wedpr/wedpr-site/web -ENTRYPOINT ["/usr/sbin/nginx","&&", "/bin/bash", "/data/home/wedpr/wedpr-site/start.sh", "true"] + +ENTRYPOINT ["/bin/sh", "-c", "/usr/sbin/nginx && /bin/bash /data/home/wedpr/wedpr-site/start.sh true"]