mirrors/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2024-11-26 03:41:01 +00:00
Code Issues Projects Releases Wiki Activity

Fix build output paths (#3065)

Browse source 
closes https://github.com/woodpecker-ci/woodpecker/issues/1766
This commit is contained in:
qwerty287 2023-12-29 20:30:20 +01:00 committed by GitHub
parent 7080d133a2
commit af513b5a30
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Makefile
View file

@ -212,9 +212,9 @@ release-server-xgo: check-xgo ## Create server binaries for release using xgo
@echo "arch (buildx):$(TARGETARCH_BUILDX)" @echo "arch (buildx):$(TARGETARCH_BUILDX)"
CGO_CFLAGS="$(CGO_CFLAGS)" xgo -go $(XGO_VERSION) -dest ./dist/server/$(TARGETOS)-$(TARGETARCH_XGO) -tags 'netgo osusergo $(TAGS)' -ldflags '-linkmode external $(LDFLAGS)' -targets '$(TARGETOS)/$(TARGETARCH_XGO)' -out woodpecker-server -pkg cmd/server . CGO_CFLAGS="$(CGO_CFLAGS)" xgo -go $(XGO_VERSION) -dest ./dist/server/$(TARGETOS)-$(TARGETARCH_XGO) -tags 'netgo osusergo $(TAGS)' -ldflags '-linkmode external $(LDFLAGS)' -targets '$(TARGETOS)/$(TARGETARCH_XGO)' -out woodpecker-server -pkg cmd/server .
mkdir -p ./dist/server/$(TARGETOS)/$(TARGETARCH_BUILDX) mkdir -p ./dist/server/$(TARGETOS)_$(TARGETARCH_BUILDX)
mv /build/woodpecker-server-$(TARGETOS)*-$(TARGETARCH_XGO)$(BIN_SUFFIX) ./dist/server/$(TARGETOS)/$(TARGETARCH_BUILDX)/woodpecker-server$(BIN_SUFFIX) mv /build/woodpecker-server-$(TARGETOS)*-$(TARGETARCH_XGO)$(BIN_SUFFIX) ./dist/server/$(TARGETOS)_$(TARGETARCH_BUILDX)/woodpecker-server$(BIN_SUFFIX)
[ "${TARGZ}" -eq "1" ] && tar -cvzf dist/woodpecker-server_$(TARGETOS)_$(TARGETARCH_BUILDX).tar.gz -C dist/server/$(TARGETOS)/$(TARGETARCH_BUILDX) woodpecker-server$(BIN_SUFFIX) || echo "skip tar.gz binary" [ "${TARGZ}" -eq "1" ] && tar -cvzf dist/woodpecker-server_$(TARGETOS)_$(TARGETARCH_BUILDX).tar.gz -C dist/server/$(TARGETOS)_$(TARGETARCH_BUILDX) woodpecker-server$(BIN_SUFFIX) || echo "skip tar.gz binary"
release-server: ## Create server binaries for release release-server: ## Create server binaries for release
# compile # compile

2
docker/Dockerfile.server.alpine.multiarch
View file

@ -12,7 +12,7 @@ ENV XDG_CACHE_HOME=/var/lib/woodpecker
ENV XDG_DATA_HOME=/var/lib/woodpecker ENV XDG_DATA_HOME=/var/lib/woodpecker
EXPOSE 8000 9000 80 443 EXPOSE 8000 9000 80 443
COPY dist/server/${TARGETOS}/${TARGETARCH}/woodpecker-server /bin/ COPY dist/server/${TARGETOS}_${TARGETARCH}/woodpecker-server /bin/
HEALTHCHECK CMD ["/bin/woodpecker-server", "ping"] HEALTHCHECK CMD ["/bin/woodpecker-server", "ping"]
ENTRYPOINT ["/bin/woodpecker-server"] ENTRYPOINT ["/bin/woodpecker-server"]

2
docker/Dockerfile.server.multiarch
View file

@ -12,7 +12,7 @@ EXPOSE 8000 9000 80 443
# copy certs from certs image # copy certs from certs image
COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
# copy server binary # copy server binary
COPY dist/server/${TARGETOS}/${TARGETARCH}/woodpecker-server /bin/ COPY dist/server/${TARGETOS}_${TARGETARCH}/woodpecker-server /bin/
HEALTHCHECK CMD ["/bin/woodpecker-server", "ping"] HEALTHCHECK CMD ["/bin/woodpecker-server", "ping"]
ENTRYPOINT ["/bin/woodpecker-server"] ENTRYPOINT ["/bin/woodpecker-server"]