diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c2ca5993..84b04c29 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -195,7 +195,7 @@ jobs: with: context: . target: STANDARD - platforms: linux/amd64,linux/arm64 + platforms: linux/amd64 push: true tags: casbin/casdoor:${{steps.get-current-tag.outputs.tag }},casbin/casdoor:latest @@ -205,6 +205,6 @@ jobs: with: context: . target: ALLINONE - platforms: linux/amd64,linux/arm64 + platforms: linux/amd64 push: true tags: casbin/casdoor-all-in-one:${{steps.get-current-tag.outputs.tag }},casbin/casdoor-all-in-one:latest diff --git a/.gitignore b/.gitignore index 05ba5a3e..12fbfa19 100644 --- a/.gitignore +++ b/.gitignore @@ -30,5 +30,4 @@ commentsRouter*.go # ignore build result casdoor -server_linux_arm64 -server_linux_amd64 +server diff --git a/Dockerfile b/Dockerfile index b011a562..f230efae 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,6 @@ FROM node:16.18.0 AS FRONT WORKDIR /web COPY ./web . -RUN yarn config set registry https://registry.npmmirror.com RUN yarn install --frozen-lockfile --network-timeout 1000000 && yarn run build @@ -14,9 +13,6 @@ RUN go test -v -run TestGetVersionInfo ./util/system_test.go ./util/system.go > FROM alpine:latest AS STANDARD LABEL MAINTAINER="https://casdoor.org/" ARG USER=casdoor -ARG TARGETOS -ARG TARGETARCH -ENV BUILDX_ARCH="${TARGETOS:-linux}_${TARGETARCH:-amd64}" RUN sed -i 's/https/http/' /etc/apk/repositories RUN apk add --update sudo @@ -31,7 +27,7 @@ RUN adduser -D $USER -u 1000 \ USER 1000 WORKDIR / -COPY --from=BACK --chown=$USER:$USER /go/src/casdoor/server_${BUILDX_ARCH} ./server +COPY --from=BACK --chown=$USER:$USER /go/src/casdoor/server ./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 @@ -50,15 +46,12 @@ RUN apt update \ FROM db AS ALLINONE LABEL MAINTAINER="https://casdoor.org/" -ARG TARGETOS -ARG TARGETARCH -ENV BUILDX_ARCH="${TARGETOS:-linux}_${TARGETARCH:-amd64}" RUN apt update RUN apt install -y ca-certificates && update-ca-certificates WORKDIR / -COPY --from=BACK /go/src/casdoor/server_${BUILDX_ARCH} ./server +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 COPY --from=BACK /go/src/casdoor/conf/app.conf ./conf/app.conf diff --git a/build.sh b/build.sh index 0a0e3af1..31ff51c0 100755 --- a/build.sh +++ b/build.sh @@ -8,5 +8,4 @@ else echo "Google is blocked, Go proxy is enabled: GOPROXY=https://goproxy.cn,direct" export GOPROXY="https://goproxy.cn,direct" fi -CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-w -s" -o server_linux_amd64 . -CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -ldflags="-w -s" -o server_linux_arm64 . +CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-w -s" -o server .