mirror of
https://github.com/woodpecker-ci/woodpecker.git
synced 2024-11-26 03:41:01 +00:00
Rename cmd agent and server folders and binaries (#330)
Renamed `cmd/drone-agent` to `cmd/agent` and `cmd/drone-server` to `cmd/server` and binaries to get rid of the drone name.
This commit is contained in:
parent
188b9e6eb5
commit
b3d40024a9
15 changed files with 20 additions and 24 deletions
|
@ -8,6 +8,6 @@ ENV DATABASE_CONFIG=/var/lib/drone/drone.sqlite
|
|||
ENV GODEBUG=netdns=go
|
||||
ENV XDG_CACHE_HOME /var/lib/drone
|
||||
|
||||
ADD release/drone-server /bin/
|
||||
ADD release/woodpecker-server /bin/
|
||||
|
||||
ENTRYPOINT ["/bin/drone-server"]
|
||||
ENTRYPOINT ["/bin/woodpecker-server"]
|
||||
|
|
|
@ -2,9 +2,9 @@
|
|||
|
||||
FROM drone/ca-certs
|
||||
ENV GODEBUG=netdns=go
|
||||
ADD release/drone-agent /bin/
|
||||
ADD release/woodpecker-agent /bin/
|
||||
|
||||
EXPOSE 3000
|
||||
HEALTHCHECK CMD ["/bin/drone-agent", "ping"]
|
||||
HEALTHCHECK CMD ["/bin/woodpecker-agent", "ping"]
|
||||
|
||||
ENTRYPOINT ["/bin/drone-agent"]
|
||||
ENTRYPOINT ["/bin/woodpecker-agent"]
|
||||
|
|
|
@ -3,10 +3,10 @@ FROM alpine:3.9.4
|
|||
RUN apk add -U --no-cache ca-certificates
|
||||
|
||||
ENV GODEBUG=netdns=go
|
||||
ADD release/drone-agent /bin/
|
||||
ADD release/woodpecker-agent /bin/
|
||||
|
||||
EXPOSE 3000
|
||||
HEALTHCHECK CMD ["/bin/drone-agent", "ping"]
|
||||
HEALTHCHECK CMD ["/bin/woodpecker-agent", "ping"]
|
||||
|
||||
ENTRYPOINT ["/bin/drone-agent"]
|
||||
ENTRYPOINT ["/bin/woodpecker-agent"]
|
||||
|
||||
|
|
|
@ -8,6 +8,6 @@ ENV DATABASE_CONFIG=/var/lib/drone/drone.sqlite
|
|||
ENV GODEBUG=netdns=go
|
||||
ENV XDG_CACHE_HOME /var/lib/drone
|
||||
|
||||
ADD release/drone-server /bin/
|
||||
ADD release/woodpecker-server /bin/
|
||||
|
||||
ENTRYPOINT ["/bin/drone-server"]
|
||||
ENTRYPOINT ["/bin/woodpecker-server"]
|
||||
|
|
16
Makefile
16
Makefile
|
@ -40,10 +40,10 @@ vet:
|
|||
@go vet $(GO_PACKAGES)
|
||||
|
||||
test-agent:
|
||||
$(DOCKER_RUN) go test -race -timeout 30s github.com/woodpecker-ci/woodpecker/cmd/drone-agent $(GO_PACKAGES)
|
||||
$(DOCKER_RUN) go test -race -timeout 30s github.com/woodpecker-ci/woodpecker/cmd/agent $(GO_PACKAGES)
|
||||
|
||||
test-server:
|
||||
$(DOCKER_RUN) go test -race -timeout 30s github.com/woodpecker-ci/woodpecker/cmd/drone-server
|
||||
$(DOCKER_RUN) go test -race -timeout 30s github.com/woodpecker-ci/woodpecker/cmd/server
|
||||
|
||||
test-frontend:
|
||||
(cd web/; yarn run test)
|
||||
|
@ -54,10 +54,10 @@ test-lib:
|
|||
test: test-lib test-agent test-server
|
||||
|
||||
build-agent:
|
||||
$(DOCKER_RUN) go build -o build/drone-agent github.com/woodpecker-ci/woodpecker/cmd/drone-agent
|
||||
$(DOCKER_RUN) go build -o build/woodpecker-agent github.com/woodpecker-ci/woodpecker/cmd/agent
|
||||
|
||||
build-server:
|
||||
$(DOCKER_RUN) go build -o build/drone-server github.com/woodpecker-ci/woodpecker/cmd/drone-server
|
||||
$(DOCKER_RUN) go build -o build/woodpecker-server github.com/woodpecker-ci/woodpecker/cmd/server
|
||||
|
||||
build-frontend:
|
||||
(cd web/; yarn run build)
|
||||
|
@ -65,10 +65,10 @@ build-frontend:
|
|||
build: build-agent build-server
|
||||
|
||||
release-agent:
|
||||
GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -o release/drone-agent github.com/woodpecker-ci/woodpecker/cmd/drone-agent
|
||||
GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -o release/woodpecker-agent github.com/woodpecker-ci/woodpecker/cmd/agent
|
||||
|
||||
release-server:
|
||||
GOOS=linux GOARCH=amd64 CGO_ENABLED=1 go build -ldflags '${LDFLAGS}' -o release/drone-server github.com/woodpecker-ci/woodpecker/cmd/drone-server
|
||||
GOOS=linux GOARCH=amd64 CGO_ENABLED=1 go build -ldflags '${LDFLAGS}' -o release/woodpecker-server github.com/woodpecker-ci/woodpecker/cmd/server
|
||||
|
||||
release-cli:
|
||||
# disable CGO for cross-compiling
|
||||
|
@ -89,7 +89,3 @@ release-cli:
|
|||
sha256sum cli/release/*.tar.gz > cli/release/woodpecker_checksums.txt
|
||||
|
||||
release: release-agent release-server
|
||||
|
||||
install:
|
||||
go install github.com/woodpecker-ci/woodpecker/cmd/drone-agent
|
||||
go install github.com/woodpecker-ci/woodpecker/cmd/drone-server
|
||||
|
|
|
@ -26,9 +26,9 @@ import (
|
|||
|
||||
func main() {
|
||||
app := cli.NewApp()
|
||||
app.Name = "drone-agent"
|
||||
app.Name = "woodpecker-agent"
|
||||
app.Version = version.String()
|
||||
app.Usage = "drone agent"
|
||||
app.Usage = "woodpecker agent"
|
||||
app.Action = loop
|
||||
app.Commands = []cli.Command{
|
||||
{
|
|
@ -28,9 +28,9 @@ import (
|
|||
func main() {
|
||||
godotenv.Load(".env")
|
||||
app := cli.NewApp()
|
||||
app.Name = "drone-server"
|
||||
app.Name = "woodpecker-server"
|
||||
app.Version = version.String()
|
||||
app.Usage = "drone server"
|
||||
app.Usage = "woodpecker server"
|
||||
app.Action = server
|
||||
app.Flags = flags
|
||||
app.Before = before
|
Loading…
Reference in a new issue