update generated project files

Signed-off-by: Jess Frazelle <[email protected]>

.gitignore

@@ -43,5 +43,4 @@ Icon
 .Trashes
 
 dockfmt
-binaries
-cross
+cross/

.travis.yml

@@ -4,7 +4,6 @@
   notifications:
     email: true
   go:
-    - 1.7.x
     - 1.8.x
     - 1.9.x
     - tip

Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:latest
+FROM golang:alpine as builder
 MAINTAINER Jessica Frazelle <[email protected]>
 
 ENV PATH /go/bin:/usr/local/go/bin:$PATH
@@ -11,16 +11,22 @@ COPY . /go/src/github.com/jessfraz/dockfmt
 
 RUN set -x \
 	&& apk add --no-cache --virtual .build-deps \
-		go \
 		git \
 		gcc \
 		libc-dev \
 		libgcc \
+		make \
 	&& cd /go/src/github.com/jessfraz/dockfmt \
-	&& go build -o /usr/bin/dockfmt . \
+	&& make static \
+	&& mv dockfmt /usr/bin/dockfmt \
 	&& apk del .build-deps \
 	&& rm -rf /go \
 	&& echo "Build complete."
 
+FROM scratch
+
+COPY --from=builder /usr/bin/dockfmt /usr/bin/dockfmt
+COPY --from=builder /etc/ssl/certs/ /etc/ssl/certs
 
 ENTRYPOINT [ "dockfmt" ]
+CMD [ "--help" ]

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Jess Frazelle
+Copyright (c) 2018 Jessica Frazelle
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -19,4 +19,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-

Makefile

@@ -70,7 +70,7 @@ staticcheck: ## Verifies `staticcheck` passes
 .PHONY: install
 install: ## Installs the executable or package
 	@echo "+ $@"
-	@go install .
+	go install -a -tags "$(BUILDTAGS)" ${GO_LDFLAGS} .
 
 define buildpretty
 mkdir -p $(BUILDDIR)/$(1)/$(2);
@@ -103,7 +103,7 @@ release: *.go VERSION ## Builds the cross-compiled binaries, naming them in such
 
 .PHONY: bump-version
 BUMP := patch
-bump-version: ## Bump the version in the version file. Set KIND to [ patch | major | minor ]
+bump-version: ## Bump the version in the version file. Set BUMP to [ patch | major | minor ]
 	@go get -u github.com/jessfraz/junk/sembump # update sembump tool
 	$(eval NEW_VERSION = $(shell sembump --kind $(BUMP) $(VERSION)))
 	@echo "Bumping VERSION from $(VERSION) to $(NEW_VERSION)"