Merge pull request #362 from nginx-proxy/restructure

Re-organize the project structure, change the name and clean the dependencies.

Author: buchdag

.dockerignore

@@ -1,4 +1,10 @@
 .git
+.github
 docker-gen
 dist
+examples
+LICENSE
+Makefile
+README.md
+templates
 *.gz

.github/workflows/tests.yml

@@ -32,4 +32,4 @@ jobs:
         run: make check-gofmt
 
       - name: Run tests
-        run: go test -v
+        run: go test -v ./internal/dockergen

.gitignore

@@ -1,3 +1,4 @@
 docker-gen
+!cmd/docker-gen
 dist
 *.gz

Makefile

@@ -44,11 +44,16 @@ get-deps:
 	go mod download
 
 check-gofmt:
-	if [ -n "$(shell gofmt -l .)" ]; then \
+	if [ -n "$(shell gofmt -l ./cmd/docker-gen)" ]; then \
 		echo 1>&2 'The following files need to be formatted:'; \
-		gofmt -l .; \
+		gofmt -l ./cmd/docker-gen; \
+		exit 1; \
+	fi
+	if [ -n "$(shell gofmt -l ./internal/dockergen)" ]; then \
+		echo 1>&2 'The following files need to be formatted:'; \
+		gofmt -l ./internal/dockergen; \
 		exit 1; \
 	fi
 
 test:
-	go test
+	go test ./internal/dockergen

cmd/docker-gen/main.go

@@ -6,11 +6,10 @@ import (
 	"log"
 	"os"
 	"path/filepath"
-	"sync"
 
 	"github.com/BurntSushi/toml"
 	docker "github.com/fsouza/go-dockerclient"
-	"github.com/jwilder/docker-gen"
+	"github.com/nginx-proxy/docker-gen/internal/dockergen"
 )
 
 type stringslice []string
@@ -36,8 +35,6 @@ var (
 	tlsKey                string
 	tlsCaCert             string
 	tlsVerify             bool
-	tlsCertPath           string
-	wg                    sync.WaitGroup
 )
 
 func (strings *stringslice) String() string {
@@ -69,7 +66,7 @@ Environment Variables:
   DOCKER_CERT_PATH - directory path containing key.pem, cert.pem and ca.pem
   DOCKER_TLS_VERIFY - enable client TLS verification
 `)
-	println(`For more information, see https://github.com/jwilder/docker-gen`)
+	println(`For more information, see https://github.com/nginx-proxy/docker-gen`)
 }
 
 func loadConfig(file string) error {

example.conf renamed to examples/example.conf

@@ -1,27 +1,9 @@
-module github.com/jwilder/docker-gen
+module github.com/nginx-proxy/docker-gen
 
-go 1.11
+go 1.16
 
 require (
-	github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
 	github.com/BurntSushi/toml v0.3.1
-	github.com/Microsoft/go-winio v0.4.16 // indirect
-	github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect
-	github.com/containerd/continuity v0.0.0-20210315143101-93e15499afd5 // indirect
-	github.com/docker/docker v1.4.2-0.20171014114940-f2afa2623594 // indirect
-	github.com/docker/go-connections v0.4.0 // indirect
-	github.com/docker/go-units v0.3.2 // indirect
-	github.com/fsouza/go-dockerclient v0.0.0-20171009031830-d2a6d0596004
-	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/google/go-cmp v0.5.5 // indirect
-	github.com/gorilla/context v1.1.1 // indirect
-	github.com/gorilla/mux v0.0.0-20160718151158-d391bea3118c // indirect
-	github.com/gotestyourself/gotestyourself v2.2.0+incompatible // indirect
-	github.com/opencontainers/image-spec v1.0.1 // indirect
-	github.com/opencontainers/runc v0.1.1 // indirect
-	github.com/opencontainers/selinux v1.8.0 // indirect
-	github.com/sirupsen/logrus v1.8.1 // indirect
+	github.com/fsouza/go-dockerclient v1.7.2
 	github.com/stretchr/testify v1.7.0
-	golang.org/x/sys v0.0.0-20210331175145-43e1dd70ce54 // indirect
-	gotest.tools v2.2.0+incompatible // indirect
 )

go.mod

@@ -73,7 +73,7 @@ func ParseWait(s string) (*Wait, error) {
 			return nil, err
 		}
 		if max < min {
-			return nil, errors.New("Invalid wait interval: max must be larger than min")
+			return nil, errors.New("invalid wait interval: max must be larger than min")
 		}
 	} else {
 		max = 4 * min