Skip to content

Commit

Permalink
fix: fix dockerfile (#866)
Browse files Browse the repository at this point in the history
  • Loading branch information
ComradeProgrammer committed Jul 7, 2022
1 parent 61773d3 commit 81f2d01
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
7 changes: 3 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ service mariadb start

mysqladmin -u root password ${MYSQL_ROOT_PASSWORD}

exec /app/server --createDatabase=true
exec /server --createDatabase=true

0 comments on commit 81f2d01

Please sign in to comment.