From b46525a3068fd69a9cad9cdec2c27e8722f2acd7 Mon Sep 17 00:00:00 2001 From: Bo-Yi Wu Date: Fri, 10 Nov 2017 10:04:19 +0800 Subject: [PATCH] add arm arm64 and amd64 build. Signed-off-by: Bo-Yi Wu --- .drone.yml | 18 ++++++++++++++++-- Dockerfile | 2 +- Makefile | 11 ++++++++--- 3 files changed, 25 insertions(+), 6 deletions(-) diff --git a/.drone.yml b/.drone.yml index 400d63f..663fc5a 100644 --- a/.drone.yml +++ b/.drone.yml @@ -18,12 +18,26 @@ pipeline: - make lint - make test-vendor - build: + linux_amd64: image: appleboy/golang-testing pull: true group: golang commands: - - make docker_build + - make linux_amd64 + + linux_arm64: + image: appleboy/golang-testing + pull: true + group: golang + commands: + - make linux_arm64 + + linux_arm: + image: appleboy/golang-testing + pull: true + group: golang + commands: + - make linux_arm test: image: appleboy/golang-testing diff --git a/Dockerfile b/Dockerfile index 470f5dc..213707a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,5 +12,5 @@ LABEL org.label-schema.name="drone-ssh" LABEL org.label-schema.vendor="Bo-Yi Wu" LABEL org.label-schema.schema-version="1.0" -ADD drone-ssh /bin/ +ADD release/linux/amd64/drone-ssh /bin/ ENTRYPOINT ["/bin/drone-ssh"] diff --git a/Makefile b/Makefile index 770e062..1bbbbbc 100644 --- a/Makefile +++ b/Makefile @@ -112,9 +112,14 @@ release-copy: release-check: cd $(DIST)/release; $(foreach file,$(wildcard $(DIST)/release/$(EXECUTABLE)-*),sha256sum $(notdir $(file)) > $(notdir $(file)).sha256;) -# for docker. -docker_build: - CGO_ENABLED=0 GOOS=linux GOARCH=amd64 $(GO) build -a -tags '$(TAGS)' -ldflags "$(EXTLDFLAGS)-s -w $(LDFLAGS)" -o $(DEPLOY_IMAGE) +linux_amd64: + CGO_ENABLED=0 GOOS=linux GOARCH=amd64 $(GO) build -a -tags '$(TAGS)' -ldflags "$(EXTLDFLAGS)-s -w $(LDFLAGS)" -o release/linux/amd64/$(EXECUTABLE) + +linux_arm64: + CGO_ENABLED=0 GOOS=linux GOARCH=arm64 $(GO) build -a -tags '$(TAGS)' -ldflags "$(EXTLDFLAGS)-s -w $(LDFLAGS)" -o release/linux/arm64/$(EXECUTABLE) + +linux_arm: + CGO_ENABLED=0 GOOS=linux GOARCH=arm GOARM=7 $(GO) build -a -tags '$(TAGS)' -ldflags "$(EXTLDFLAGS)-s -w $(LDFLAGS)" -o release/arm/amd64/$(EXECUTABLE) docker_image: docker build -t $(DEPLOY_ACCOUNT)/$(DEPLOY_IMAGE) .