Merge pull request #16 from sendgrid/fix-artifact

fix artifact upload. fix yaml lint errors #minor

Author: Michael Robinson

.buildkite/pipeline.yml

@@ -20,10 +20,10 @@ steps:
     command: 'workflow status_checks'
     branches: '!master'
 
-  # The purpose of this script is to determine what version you are attempting to bump to.
-  # This script will then write out that version into a file named 'version_wf', which
-  # will be used by the build system to create pull requests, and your app itself may
-  # use the file as well.
+  # The purpose of this script is to determine what version you are
+  # attempting to bump to.  This script will then write out that version
+  # into a file named 'version_wf', which will be used by the build system
+  # to create pull requests, and your app itself may use the file as well.
   - label: 'prebuild_determine_version'
     env:
       # Use automatic versioning.
@@ -41,11 +41,10 @@ steps:
   # Build, Test, Lint
   ##############################
   - label: 'Build Binary'
-    command: 
-      - 'make build-docker'
-      - 'buildkite-agent artifact upload aws-env'
+    command: 'make artifact'
+    artifact_paths: 'aws-env'
 
-  - label: 'Unit Tests & Code Coverage' 
+  - label: 'Unit Tests & Code Coverage'
     command: 'make test && make report'
     artifact_paths: 'coverage.html'
 
@@ -60,7 +59,7 @@ steps:
 
   # On master builds, push the versioned image
   - label: 'Release :shipit:'
-    command: 
+    command:
       - 'mkdir build'
       - 'buildkite-agent artifact download aws-env build/'
       - 'make release'
@@ -72,9 +71,9 @@ steps:
   # Post-Publish
   ##############################
 
-  # This script will use the previously written version_wf file to update the version
-  # inside of github, as well as create release notes with a link back to the
-  # merged pull request.
+  # This script will use the previously written version_wf file to update
+  # the version inside of github, as well as create release notes with a
+  # link back to the merged pull request.
   #- label: 'postbuild_tagrepo_update_releasenotes'
   #  env:
   #    # Use automatic versioning.

.gitignore

@@ -1,2 +1,3 @@
 /aws-env
 /coverage.*
+version_wf

Dockerfile

@@ -18,6 +18,11 @@ RUN go mod download
 
 COPY . .
 
+ARG GIT_COMMIT=unknown
+ARG BUILD_DATE=unknown
+ARG VERSION=0.0.1
+ARG BUILD_NUMBER=0
+
 RUN make build
 
 # The release (default) stage is a minimal production image suitable for use

Makefile

@@ -3,10 +3,10 @@ WD ?= $(shell pwd)
 NAMESPACE=sendgrid
 APPNAME=aws-env
 
-GIT_COMMIT = $(shell git rev-parse --verify HEAD)
-BUILD_DATE = $(shell date -u)
-VERSION = $(if $(shell cat version_wf),$(shell cat version_wf),0.0.1)
-BUILD_NUMBER = $(if $(BUILDKITE_BUILD_NUMBER),$(BUILDKITE_BUILD_NUMBER),0)
+export GIT_COMMIT ?= $(shell git rev-parse --verify HEAD)
+export BUILD_DATE ?= $(shell date -u)
+export VERSION ?= $(or $(shell cat version_wf),0.0.1)
+export BUILD_NUMBER ?= $(or $(BUILDKITE_BUILD_NUMBER),0)
 
 GO_FILES = $(shell find . -type f -name "*.go")
 
@@ -23,7 +23,16 @@ $(BINARIES): $(GO_FILES)
 
 .PHONY: build-docker
 build-docker:
-	@docker build -t aws-env --target build .
+	@docker build -t aws-env \
+		--build-arg GIT_COMMIT \
+		--build-arg BUILD_DATE \
+		--build-arg VERSION \
+		--build-arg BUILD_NUMBER \
+		--target build .
+
+.PHONY: artifact
+artifact: build-docker
+	@docker run -v $(WD):/dist --rm aws-env cp /code/aws-env /dist/
 
 .PHONY: clean
 clean: