Set version number

Author: clareliguori

Diff for: .gitignore

@@ -13,3 +13,5 @@
 
 bin/
 output/
+
+GITCOMMIT_SHA

Diff for: Dockerfile

@@ -1,11 +1,9 @@
 FROM golang:1.11 AS builder
 
-RUN curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
-
 WORKDIR /go/src/github.com/awslabs/img2lambda
 
 COPY . ./
-RUN make
+RUN make install-deps && make
 
 FROM busybox:glibc
 COPY --from=builder /go/src/github.com/awslabs/img2lambda/bin/local/img2lambda /bin/img2lambda

Diff for: Makefile

@@ -9,13 +9,14 @@ LINUX_BINARY := bin/linux-amd64/img2lambda
 DARWIN_BINARY := bin/darwin-amd64/img2lambda
 WINDOWS_BINARY := bin/windows-amd64/img2lambda.exe
 LOCAL_PATH := $(ROOT)/scripts:${PATH}
-DEP_RELEASE_TAG := v0.4.1
+VERSION := $(shell cat VERSION)
+GITFILES := $(shell find ".git/")
 
 .PHONY: build
 build: $(LOCAL_BINARY)
 
-$(LOCAL_BINARY): $(SOURCES)
-	./scripts/build_binary.sh ./bin/local
+$(LOCAL_BINARY): $(SOURCES) GITCOMMIT_SHA
+	./scripts/build_binary.sh ./bin/local $(VERSION) $(shell cat GITCOMMIT_SHA)
 	@echo "Built img2lambda"
 
 .PHONY: test
@@ -26,9 +27,8 @@ test:
 generate: $(SOURCES)
 	PATH=$(LOCAL_PATH) go generate ./...
 
-.PHONY: generate-deps
-generate-deps:
-	DEP_RELEASE_TAG=$DEP_RELEASE_TAG
+.PHONY: install-deps
+install-deps:
 	curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
 
 .PHONY: windows-build
@@ -57,25 +57,29 @@ docker-test:
 		--env IMG_TOOL_RELEASE=$(IMG_TOOL_RELEASE) \
 		golang:1.11 make test
 
-.PHONY: supported-platforms
-supported-platforms: $(LINUX_BINARY) $(DARWIN_BINARY) $(WINDOWS_BINARY)
+.PHONY: all-platforms
+all-platforms: $(LINUX_BINARY) $(DARWIN_BINARY) $(WINDOWS_BINARY)
 
-$(WINDOWS_BINARY): $(SOURCES)
+$(WINDOWS_BINARY): $(SOURCES) GITCOMMIT_SHA
 	@mkdir -p ./bin/windows-amd64
-	TARGET_GOOS=windows GOARCH=amd64 ./scripts/build_binary.sh ./bin/windows-amd64
+	TARGET_GOOS=windows GOARCH=amd64 ./scripts/build_binary.sh ./bin/windows-amd64 $(VERSION) $(shell cat GITCOMMIT_SHA)
 	mv ./bin/windows-amd64/img2lambda ./bin/windows-amd64/img2lambda.exe
 	@echo "Built img2lambda.exe for windows"
 
-$(LINUX_BINARY): $(SOURCES)
+$(LINUX_BINARY): $(SOURCES) GITCOMMIT_SHA
 	@mkdir -p ./bin/linux-amd64
-	TARGET_GOOS=linux GOARCH=amd64 ./scripts/build_binary.sh ./bin/linux-amd64
+	TARGET_GOOS=linux GOARCH=amd64 ./scripts/build_binary.sh ./bin/linux-amd64 $(VERSION) $(shell cat GITCOMMIT_SHA)
 	@echo "Built img2lambda for linux"
 
-$(DARWIN_BINARY): $(SOURCES)
+$(DARWIN_BINARY): $(SOURCES) GITCOMMIT_SHA
 	@mkdir -p ./bin/darwin-amd64
-	TARGET_GOOS=darwin GOARCH=amd64 ./scripts/build_binary.sh ./bin/darwin-amd64
+	TARGET_GOOS=darwin GOARCH=amd64 ./scripts/build_binary.sh ./bin/darwin-amd64 $(VERSION) $(shell cat GITCOMMIT_SHA)
 	@echo "Built img2lambda for darwin"
 
+GITCOMMIT_SHA: $(GITFILES)
+	git rev-parse --short=7 HEAD > GITCOMMIT_SHA
+
 .PHONY: clean
 clean:
-rm -rf ./bin/ ||:
+	- rm -rf ./bin
+	- rm -f GITCOMMIT_SHA

Diff for: VERSION

@@ -0,0 +1 @@
+0.0.1

Diff for: main.go

@@ -23,6 +23,7 @@ func createApp() (*cli.App, *cmdOptions) {
 	app := cli.NewApp()
 	app.EnableBashCompletion = true
 	app.Name = "img2lambda"
+	app.Version = VersionString()
 	app.Usage = "Repackages a container image into AWS Lambda layers and publishes them to Lambda"
 	app.Action = func(c *cli.Context) error {
 		validateCliOptions(&opts, c)

Diff for: scripts/build_binary.sh

@@ -4,9 +4,20 @@
 ROOT=$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )
 cd "${ROOT}"
 
-# Builds the ecs-cli binary from source in the specified destination paths.
+# Builds the binary from source in the specified destination paths.
 mkdir -p $1
 
 cd "${ROOT}"
 
-GOOS=$TARGET_GOOS go build -tags="containers_image_ostree_stub exclude_graphdriver_devicemapper exclude_graphdriver_overlay exclude_graphdriver_btrfs containers_image_openpgp" -o $1/img2lambda .
+BUILDTAGS="containers_image_ostree_stub exclude_graphdriver_devicemapper exclude_graphdriver_overlay exclude_graphdriver_btrfs containers_image_openpgp"
+
+VERSION_LDFLAGS=""
+if [[ -n "${2}" ]]; then
+  VERSION_LDFLAGS="-X main.Version=${2}"
+fi
+
+if [[ -n "${3}" ]]; then
+  VERSION_LDFLAGS="$VERSION_LDFLAGS -X main.GitCommitSHA=${3}"
+fi
+
+GOOS=$TARGET_GOOS go build -a -tags="${BUILDTAGS}" -ldflags "-s ${VERSION_LDFLAGS}" -o $1/img2lambda .

Diff for: version.go

@@ -0,0 +1,11 @@
+package main
+
+// Version indicates which version of the binary is running.
+var Version = "master"
+
+// GitCommitSHA indicates which git shorthash the binary was built off of
+var GitCommitSHA string
+
+func VersionString() string {
+	return Version + " (" + GitCommitSHA + ")"
+}