Skip to content

Commit

Permalink
fix: ci build
Browse files Browse the repository at this point in the history
  • Loading branch information
wintbiit committed Sep 22, 2024
1 parent fd3ae3c commit 3ec4584
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
3 changes: 1 addition & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ ADD go.mod go.sum ./
RUN go mod download

COPY . .
RUN ./build.sh
RUN sh ./build.sh

FROM alpine:3.16
LABEL MAINTAINER="https://casdoor.org/"
Expand All @@ -34,7 +34,6 @@ WORKDIR /
COPY --from=BACK --chown=$USER:$USER /go/src/casdoor/server_${BUILDX_ARCH} ./server
COPY --from=BACK --chown=$USER:$USER /go/src/casdoor/swagger ./swagger
COPY --from=BACK --chown=$USER:$USER /go/src/casdoor/conf/app.conf ./conf/app.conf
COPY --from=BACK --chown=$USER:$USER /go/src/casdoor/version_info.txt ./go/src/casdoor/version_info.txt
COPY --from=FRONT --chown=$USER:$USER /web/build ./web/build

ENTRYPOINT ["/server"]
1 change: 0 additions & 1 deletion build.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#!/bin/bash
#try to connect to google to determine whether user need to use proxy
curl www.google.com -o /dev/null --connect-timeout 5 2> /dev/null
if [ $? == 0 ]
Expand Down

0 comments on commit 3ec4584

Please sign in to comment.