DevFW-CICD/ingress-nginx-helm
14
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #204 from ixdy/docker-build-pull

Browse source 
Always docker --pull when building to fetch latest base images
This commit is contained in:
Manuel Alejandro de Brito Fontes 2017-02-02 07:39:22 -03:00 committed by GitHub
commit 5a0fa0dca7
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
controllers/gce/Makefile
View file

@ -8,7 +8,7 @@ server:
CGO_ENABLED=0 GOOS=linux godep go build -a -installsuffix cgo -ldflags '-w' -o glbc *.go CGO_ENABLED=0 GOOS=linux godep go build -a -installsuffix cgo -ldflags '-w' -o glbc *.go
container: server container: server
docker build -t $(PREFIX):$(TAG) . docker build --pull -t $(PREFIX):$(TAG) .
push: container push: container
gcloud docker push $(PREFIX):$(TAG) gcloud docker push $(PREFIX):$(TAG)

2
controllers/nginx/Makefile
View file

@ -21,7 +21,7 @@ build: clean
-o rootfs/nginx-ingress-controller ${PKG}/pkg/cmd/controller -o rootfs/nginx-ingress-controller ${PKG}/pkg/cmd/controller
container: build container: build
docker build -t $(PREFIX):$(RELEASE) rootfs docker build --pull -t $(PREFIX):$(RELEASE) rootfs
push: container push: container
gcloud docker push $(PREFIX):$(RELEASE) gcloud docker push $(PREFIX):$(RELEASE)