From 81f2d01dc17b0ffce8bf3d172556a065ee87ecbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D0=BE=D0=B2=D0=B0=D1=80=D0=B8=D1=89=20=D0=BF=D1=80?= =?UTF-8?q?=D0=BE=D0=B3=D1=80=D0=B0=D0=BC=D0=BC=D0=B8=D1=81=D1=82?= <46831212+ComradeProgrammer@users.noreply.github.com> Date: Thu, 7 Jul 2022 16:10:15 +0800 Subject: [PATCH] fix: fix dockerfile (#866) --- Dockerfile | 7 +++---- docker-entrypoint.sh | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index ad7ac1cf297..3f42fb1d889 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,13 +14,12 @@ RUN ./build.sh FROM alpine:latest AS STANDARD LABEL MAINTAINER="https://casdoor.org/" -WORKDIR /app +WORKDIR / COPY --from=BACK /go/src/casdoor/server ./server COPY --from=BACK /go/src/casdoor/swagger ./swagger COPY --from=BACK /go/src/casdoor/conf/app.conf ./conf/app.conf COPY --from=FRONT /web/build ./web/build -VOLUME /app/files /app/logs -ENTRYPOINT ["/app/server"] +ENTRYPOINT ["/server"] FROM debian:latest AS db @@ -36,7 +35,7 @@ LABEL MAINTAINER="https://casdoor.org/" ENV MYSQL_ROOT_PASSWORD=123456 -WORKDIR /app +WORKDIR / COPY --from=BACK /go/src/casdoor/server ./server COPY --from=BACK /go/src/casdoor/swagger ./swagger COPY --from=BACK /go/src/casdoor/docker-entrypoint.sh /docker-entrypoint.sh diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index f38bc1d2b87..965c0fd9b9f 100644 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -4,4 +4,4 @@ service mariadb start mysqladmin -u root password ${MYSQL_ROOT_PASSWORD} -exec /app/server --createDatabase=true +exec /server --createDatabase=true