mirror of
https://github.com/woodpecker-ci/woodpecker.git
synced 2024-11-22 01:41:02 +00:00
Fix build output paths (#3065)
closes https://github.com/woodpecker-ci/woodpecker/issues/1766
This commit is contained in:
parent
7080d133a2
commit
af513b5a30
3 changed files with 5 additions and 5 deletions
6
Makefile
6
Makefile
|
@ -212,9 +212,9 @@ release-server-xgo: check-xgo ## Create server binaries for release using xgo
|
|||
@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 .
|
||||
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)
|
||||
[ "${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"
|
||||
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)
|
||||
[ "${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
|
||||
# compile
|
||||
|
|
|
@ -12,7 +12,7 @@ ENV XDG_CACHE_HOME=/var/lib/woodpecker
|
|||
ENV XDG_DATA_HOME=/var/lib/woodpecker
|
||||
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"]
|
||||
ENTRYPOINT ["/bin/woodpecker-server"]
|
||||
|
|
|
@ -12,7 +12,7 @@ EXPOSE 8000 9000 80 443
|
|||
# copy certs from certs image
|
||||
COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
|
||||
# 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"]
|
||||
ENTRYPOINT ["/bin/woodpecker-server"]
|
||||
|
|
Loading…
Reference in a new issue