Skip to content

Commit 0f58b93

Browse files
authored
Merge pull request #1 from mlatorre31/fix-restart
Fix @NickBolles restart feature building and Alpine bin compilation flag
2 parents 2ff5971 + 139979b commit 0f58b93

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ dist-clean:
1717
rm -f docker-gen-darwin-*.tar.gz
1818

1919
dist: dist-clean
20-
mkdir -p dist/alpine-linux/amd64 && GOOS=linux GOARCH=amd64 go build -ldflags "$(LDFLAGS)" -a -tags netgo -installsuffix netgo -o dist/alpine-linux/amd64/docker-gen ./cmd/docker-gen
20+
mkdir -p dist/alpine-linux/amd64 && GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags "$(LDFLAGS)" -a -tags netgo -installsuffix netgo -o dist/alpine-linux/amd64/docker-gen ./cmd/docker-gen
2121
mkdir -p dist/alpine-linux/arm64 && GOOS=linux GOARCH=arm64 go build -ldflags "$(LDFLAGS)" -a -tags netgo -installsuffix netgo -o dist/alpine-linux/arm64/docker-gen ./cmd/docker-gen
2222
mkdir -p dist/alpine-linux/armhf && GOOS=linux GOARCH=arm GOARM=6 go build -ldflags "$(LDFLAGS)" -a -tags netgo -installsuffix netgo -o dist/alpine-linux/armhf/docker-gen ./cmd/docker-gen
2323
mkdir -p dist/linux/amd64 && GOOS=linux GOARCH=amd64 go build -ldflags "$(LDFLAGS)" -o dist/linux/amd64/docker-gen ./cmd/docker-gen

cmd/docker-gen/main.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010

1111
"github.com/BurntSushi/toml"
1212
docker "github.com/fsouza/go-dockerclient"
13+
"github.com/jwilder/docker-gen"
1314
)
1415

1516
type stringslice []string

config.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55
"strings"
66
"time"
77

8-
"github.com/fsouza/go-dockerclient"
98
)
109

1110
type Config struct {
@@ -15,7 +14,7 @@ type Config struct {
1514
Wait *Wait
1615
NotifyCmd string
1716
NotifyOutput bool
18-
NotifyContainers map[string]docker.Signal
17+
NotifyContainers map[string]int
1918
OnlyExposed bool
2019
OnlyPublished bool
2120
IncludeStopped bool

0 commit comments

Comments
 (0)