Merge pull request #10 from chris-crone/simple-ci

Rework build for CI

Author: mat007

.dockerignore

@@ -1,2 +1,4 @@
+.git
 *.docker-app
+*.tar.gz
 _build/

.gitignore

@@ -1,2 +1,3 @@
+*.tar.gz
 *.docker-app
 _build/

Dockerfile

@@ -1,14 +1,18 @@
-ARG GO_VERSION=1.10
-ARG RUN_BASE_TAG=3.7
-ARG BUILD_BASE_TAG=${GO_VERSION}-alpine${RUN_BASE_TAG}
+ARG ALPINE_VERSION=3.7
+ARG GO_VERSION=1.10.1
+ARG TAG=unknown
 
-FROM golang:${BUILD_BASE_TAG} AS build
+FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION} AS build
 RUN apk add --no-cache \
-  make
+  build-base \
+  git
 WORKDIR /go/src/github.com/docker/lunchbox/
 COPY . .
-RUN make bin
 
-FROM alpine:${RUN_BASE_TAG} AS run
-COPY --from=build /go/src/github.com/docker/lunchbox/_build/bin/docker-app /
-ENTRYPOINT ["/docker-app"]
+FROM build AS bin-build
+ARG TAG
+RUN make TAG=${TAG} bin-all
+
+FROM build AS test
+ARG TAG
+RUN make TAG=${TAG} unit-test e2e-test

Jenkinsfile

@@ -0,0 +1,14 @@
+node('gcp-linux-worker-0') {
+    stage('Build') {
+        dir('src/github.com/docker/lunchbox') {
+            checkout scm
+            sh 'docker image prune -f'
+            sh 'make ci-lint'
+            sh 'make ci-test'
+            sh 'make ci-bin-linux'
+            sh 'make ci-bin-darwin'
+            sh 'make ci-bin-windows'
+            archiveArtifacts '*.tar.gz'
+        }
+    }
+}

Makefile

@@ -1,18 +1,24 @@
 PKG_NAME := github.com/docker/lunchbox
 BIN_NAME := docker-app
 
-TAG := ${shell git describe --always --dirty}
+TAG ?= $(shell git describe --always --dirty)
 
 IMAGE_NAME := docker-app
 
-GO_VERSION := 1.10
-RUN_BASE_TAG := 3.7
+ALPINE_VERSION := 3.7
+GO_VERSION := 1.10.1
 
 IMAGE_BUILD_ARGS := \
+    --build-arg ALPINE_VERSION=$(ALPINE_VERSION) \
     --build-arg GO_VERSION=$(GO_VERSION) \
-    --build-arg RUN_BASE_TAG=$(RUN_BASE_TAG)
+    --build-arg BIN_NAME=$(BIN_NAME) \
+    --build-arg TAG=$(TAG)
 
-LDFLAGS :=
+LDFLAGS := "-s -w"
+
+#####################
+# Local Development #
+#####################
 
 EXEC_EXT :=
 ifeq ($(OS),Windows_NT)
@@ -26,22 +32,18 @@ CHECK_GO_ENV:
 		(echo "Invalid Go environment" && false)
 
 bin: CHECK_GO_ENV
-	@echo "Building _build/bin/$(BIN_NAME)$(EXEC_EXT)..."
-	@go build -ldflags=$(LDFLAGS) -i -o _build/bin/$(BIN_NAME)$(EXEC_EXT) ./
+	@echo "Building _build/$(BIN_NAME)$(EXEC_EXT)..."
+	go build -ldflags=$(LDFLAGS) -i -o _build/$(BIN_NAME)$(EXEC_EXT)
 
+OS_LIST ?= darwin linux windows
 bin-all: CHECK_GO_ENV
-	@echo "Building for all archs in _build/$(TAG)"
-	GOOS=windows go build -ldflags=$(LDFLAGS) -i -o _build/$(TAG)/$(BIN_NAME)-windows.exe ./
-	GOOS=linux go build -ldflags=$(LDFLAGS) -i -o _build/$(TAG)/$(BIN_NAME)-linux ./
-	GOOS=darwin go build -ldflags=$(LDFLAGS) -i -o _build/$(TAG)/$(BIN_NAME)-macos ./
+	@echo "Building for all platforms..."
+	$(foreach OS, $(OS_LIST), GOOS=$(OS) go build -ldflags=$(LDFLAGS) -i -o _build/$(TAG)/$(BIN_NAME)-$(OS)$(if $(filter windows, $(OS)),.exe,) || exit 1;)
 
 release:
 	gsutil cp -r _build/$(TAG) gs://docker_app
 
-image:
-	@docker build -t $(IMAGE_NAME) $(IMAGE_BUILD_ARGS) . --target run
-
-test: lint unit-test e2e-test
+test check: lint unit-test e2e-test
 
 lint:
 	@echo "Linting..."
@@ -50,14 +52,28 @@ lint:
 
 e2e-test:
 	@echo "Running e2e tests..."
-	@go test ./e2e/
+	go test ./e2e/
 
 unit-test:
 	@echo "Running unit tests..."
-	@go test $(shell go list ./... | grep -vE '/vendor/|/e2e')
+	go test $(shell go list ./... | grep -vE '/vendor/|/e2e')
 
 clean:
 	rm -Rf ./_build
 
-.PHONY: bin image test lint e2e-test unit-test clean
+######
+# CI #
+######
+
+ci-lint: lint
+
+ci-test:
+	docker build -t $(IMAGE_NAME)-test $(IMAGE_BUILD_ARGS) . --target=test
+
+ci-bin-%:
+	@echo "Building tarball for $*..."
+	docker build -t $(IMAGE_NAME)-bin-all $(IMAGE_BUILD_ARGS) . --target=bin-build
+	docker run --rm $(IMAGE_NAME)-bin-all tar -cz $(BIN_NAME)-$*$(if $(filter windows, $*),.exe,) -C /go/src/$(PKG_NAME)/_build/$(TAG)/ > $(BIN_NAME)-$*-$(TAG).tar.gz
+
+.PHONY: bin bin-all release test check lint e2e-test unit-test clean ci-lint ci-test
 .DEFAULT: all