Update for Go 1.15 (#2)

* Update for go 1.15 support
* Add pipeline

Author: vsalvino

.dockerignore

@@ -1,4 +1,3 @@
 .git
 docker-gen
-dist
 *.gz

.travis.yml

@@ -2,10 +2,8 @@ FROM alpine:latest
 
 RUN apk -U add openssl
 
-ENV VERSION 0.7.5-cr1
-ENV DOWNLOAD_URL https://github.com/coderedcorp/docker-gen/releases/download/$VERSION/docker-gen-alpine-linux-amd64-$VERSION.tar.gz
 ENV DOCKER_HOST unix:///tmp/docker.sock
 
-RUN wget -qO- $DOWNLOAD_URL | tar xvz -C /usr/local/bin
+COPY dist/alpine-linux/amd64/docker-gen /usr/local/bin/
 
 ENTRYPOINT ["/usr/local/bin/docker-gen"]

Dockerfile

@@ -26,7 +26,6 @@ dist: dist-clean
 	mkdir -p dist/linux/armel  && CGO_ENABLED=0 GOOS=linux GOARCH=arm GOARM=5 go build -ldflags "$(LDFLAGS)" -o dist/linux/armel/docker-gen ./cmd/docker-gen
 	mkdir -p dist/linux/armhf  && CGO_ENABLED=0 GOOS=linux GOARCH=arm GOARM=6 go build -ldflags "$(LDFLAGS)" -o dist/linux/armhf/docker-gen ./cmd/docker-gen
 	mkdir -p dist/darwin/amd64 && CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -ldflags "$(LDFLAGS)" -o dist/darwin/amd64/docker-gen ./cmd/docker-gen
-	mkdir -p dist/darwin/i386  && CGO_ENABLED=0 GOOS=darwin GOARCH=386 go build -ldflags "$(LDFLAGS)" -o dist/darwin/i386/docker-gen ./cmd/docker-gen
 
 
 release: dist
@@ -40,7 +39,6 @@ release: dist
 	tar -cvzf docker-gen-linux-armel-$(TAG).tar.gz -C dist/linux/armel docker-gen
 	tar -cvzf docker-gen-linux-armhf-$(TAG).tar.gz -C dist/linux/armhf docker-gen
 	tar -cvzf docker-gen-darwin-amd64-$(TAG).tar.gz -C dist/darwin/amd64 docker-gen
-	tar -cvzf docker-gen-darwin-i386-$(TAG).tar.gz -C dist/darwin/i386 docker-gen
 
 get-deps:
 	go get github.com/robfig/glock

Makefile

@@ -1,52 +1,58 @@
-docker-gen (built with go 1.11)
-=====
+docker-gen (built with Go 1.15)
+===============================
 
-Forked from jwilder/docker-gen.
+[![Build Status](https://dev.azure.com/coderedcorp/cr-github/_apis/build/status/docker-gen?branchName=master)](https://dev.azure.com/coderedcorp/cr-github/_build/latest?definitionId=14&branchName=master)
 
-To build:
+Originally forked from https://github.com/jwilder/docker-gen. This fork is
+supported and maintained by CodeRed for production use.
 
-1. Install Go 1.11.
-```
-$ wget https://dl.google.com/go/go1.11.4.linux-amd64.tar.gz
-$ sudo tar -C /usr/local -xzf go1.11.4.linux-amd64.tar.gz
-$ sudo ln -s /usr/local/go/bin/* /usr/local/bin/
-```
+## Environment Setup & Build
 
-2. Install glock and add go downloads to path.
-```
-$ go get github.com/robfig/glock
-$ export PATH=$PATH:~/go/bin/
-```
+Environment requires a Linux (or WSL) OS.
 
-3. Install dockger-gen (this seems a bit recursive, but I don't really know go that well)
-```
-$ go get github.com/coderedcorp/docker-gen
-```
+1. Install Go 1.15.
+
+   ```
+   $ wget -O golang.tar.gz https://golang.org/dl/go1.15.2.linux-amd64.tar.gz
+   $ sudo tar -C /usr/local -xzf golang.tar.gz
+   $ sudo ln -s /usr/local/go/bin/* /usr/local/bin/
+   ```
+
+   Confirm it is installed with:
+
+   ```
+   $ go version
+   ```
+
+2. Add Go bin to PATH.
+
+   ```
+   $ export PATH=$PATH:~/go/bin/
+   ```
+
+3. Clone this repo, and enter the project directory.
 
 4. Now you can build. This will create a binary `docker-gen` in the current directory.
-```
-make get-deps
-make
-```
+
+   ```
+   make get-deps
+   make
+   ```
 
 5. To publish, make sure to tag the repo (the version is pulled from the tag). Then run:
 ```
 make release
 ```
-which will build for all architectures. Upload the archives to the github release.
+which will build for all architectures. Upload the archives to the GitHub release.
 
 Original readme below.
 
----
+----
 
 
 docker-gen
 =====
 
-![latest 0.7.3](https://img.shields.io/badge/latest-0.7.3-green.svg?style=flat)
-[![Build Status](https://travis-ci.org/jwilder/docker-gen.svg?branch=master)](https://travis-ci.org/jwilder/docker-gen)
-![License MIT](https://img.shields.io/badge/license-MIT-blue.svg?style=flat)
-
 `docker-gen` is a file generator that renders templates using docker container meta-data.
 
 It can be used to generate various kinds of files for:
@@ -493,4 +499,3 @@ $ make
 ### License
 
 MIT
-

README.md

@@ -0,0 +1,38 @@
+trigger:
+ - master
+
+pool:
+  vmImage: "ubuntu-latest"
+
+steps:
+
+- task: GoTool@0
+  inputs:
+    version: "1.15.*"
+
+- script: |
+    echo "##vso[task.prependpath]/home/vsts/go/bin"
+    go env
+  displayName: "Go environment"
+
+- script: make get-deps
+  displayName: "Install deps"
+
+- script: make all
+  displayName: "Build"
+
+- script: make check-gofmt
+  displayName: "Lint"
+
+- script: make test
+  displayName: "Test"
+
+- script: make dist
+  displayName: "Build dist"
+
+- task: Docker@2
+  displayName: "Build docker"
+  inputs:
+    command: build
+    buildContext: ./
+    Dockerfile: ./Dockerfile

azure-pipelines.yml

@@ -10,7 +10,8 @@ import (
 
 	"github.com/BurntSushi/toml"
 	docker "github.com/fsouza/go-dockerclient"
-	"github.com/coderedcorp/docker-gen"
+
+	"../.."
 )
 
 type stringslice []string