github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Always --pull in docker build to ensure recent base images

pull/6/head
Jeff Grafton 2017-01-10 14:29:47 -08:00
parent add3a08a6d
commit 19aafd291c
52 changed files with 55 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/build-image/cross/Makefile
View File

@ -21,7 +21,7 @@ TAG=$(shell cat VERSION)
all: push all: push
build: build:
docker build -t gcr.io/google_containers/$(IMAGE):$(TAG) . docker build --pull -t gcr.io/google_containers/$(IMAGE):$(TAG) .
push: build push: build
gcloud docker --server=gcr.io -- push gcr.io/google_containers/$(IMAGE):$(TAG) gcloud docker --server=gcr.io -- push gcr.io/google_containers/$(IMAGE):$(TAG)

2
build/debian-iptables/Makefile
View File

@ -56,7 +56,7 @@ else
cd $(TEMP_DIR) && sed -i "s/CROSS_BUILD_//g" Dockerfile cd $(TEMP_DIR) && sed -i "s/CROSS_BUILD_//g" Dockerfile
endif endif
docker build -t $(REGISTRY)/$(IMAGE)-$(ARCH):$(TAG) $(TEMP_DIR) docker build --pull -t $(REGISTRY)/$(IMAGE)-$(ARCH):$(TAG) $(TEMP_DIR)
push: build push: build
gcloud docker -- push $(REGISTRY)/$(IMAGE)-$(ARCH):$(TAG) gcloud docker -- push $(REGISTRY)/$(IMAGE)-$(ARCH):$(TAG)

2
build/lib/release.sh
View File

@ -295,7 +295,7 @@ function kube::release::create_docker_images_for_server() {
local docker_image_tag=gcr.io/google_containers/${binary_name}-${arch}:${md5_sum} local docker_image_tag=gcr.io/google_containers/${binary_name}-${arch}:${md5_sum}
fi fi
"${DOCKER[@]}" build -q -t "${docker_image_tag}" ${docker_build_path} >/dev/null "${DOCKER[@]}" build --pull -q -t "${docker_image_tag}" ${docker_build_path} >/dev/null
"${DOCKER[@]}" save ${docker_image_tag} > ${binary_dir}/${binary_name}.tar "${DOCKER[@]}" save ${docker_image_tag} > ${binary_dir}/${binary_name}.tar
echo $md5_sum > ${binary_dir}/${binary_name}.docker_tag echo $md5_sum > ${binary_dir}/${binary_name}.docker_tag

2
build/pause/Makefile
View File

@ -78,7 +78,7 @@ bin/$(BIN)-$(ARCH): $(SRCS)
container: .container-$(ARCH) container: .container-$(ARCH)
.container-$(ARCH): bin/$(BIN)-$(ARCH) .container-$(ARCH): bin/$(BIN)-$(ARCH)
docker build -t $(IMAGE):$(TAG) --build-arg ARCH=$(ARCH) . docker build --pull -t $(IMAGE):$(TAG) --build-arg ARCH=$(ARCH) .
ifeq ($(ARCH),amd64) ifeq ($(ARCH),amd64)
docker rmi $(LEGACY_AMD64_IMAGE):$(TAG) || true docker rmi $(LEGACY_AMD64_IMAGE):$(TAG) || true
docker tag $(IMAGE):$(TAG) $(LEGACY_AMD64_IMAGE):$(TAG) docker tag $(IMAGE):$(TAG) $(LEGACY_AMD64_IMAGE):$(TAG)

2
cluster/addons/addon-manager/Makefile
View File

@ -43,7 +43,7 @@ build:
curl -sSL --retry 5 https://storage.googleapis.com/kubernetes-release/release/$(KUBECTL_VERSION)/bin/linux/$(ARCH)/kubectl > $(TEMP_DIR)/kubectl curl -sSL --retry 5 https://storage.googleapis.com/kubernetes-release/release/$(KUBECTL_VERSION)/bin/linux/$(ARCH)/kubectl > $(TEMP_DIR)/kubectl
chmod +x $(TEMP_DIR)/kubectl chmod +x $(TEMP_DIR)/kubectl
cd $(TEMP_DIR) && sed -i.back "s|BASEIMAGE|$(BASEIMAGE)|g" Dockerfile cd $(TEMP_DIR) && sed -i.back "s|BASEIMAGE|$(BASEIMAGE)|g" Dockerfile
docker build -t $(IMAGE)-$(ARCH):$(VERSION) $(TEMP_DIR) docker build --pull -t $(IMAGE)-$(ARCH):$(VERSION) $(TEMP_DIR)
push: build push: build
gcloud docker -- push $(IMAGE)-$(ARCH):$(VERSION) gcloud docker -- push $(IMAGE)-$(ARCH):$(VERSION)

2
cluster/addons/fluentd-elasticsearch/es-image/Makefile
View File

@ -19,7 +19,7 @@
TAG = v2.4.1 TAG = v2.4.1
build: elasticsearch_logging_discovery build: elasticsearch_logging_discovery
docker build -t gcr.io/google_containers/elasticsearch:$(TAG) . docker build --pull -t gcr.io/google_containers/elasticsearch:$(TAG) .
push: push:
gcloud docker -- push gcr.io/google_containers/elasticsearch:$(TAG) gcloud docker -- push gcr.io/google_containers/elasticsearch:$(TAG)

2
cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
View File

@ -19,7 +19,7 @@ IMAGE = fluentd-elasticsearch
TAG = 1.20 TAG = 1.20
build: build:
docker build -t $(PREFIX)/$(IMAGE):$(TAG) . docker build --pull -t $(PREFIX)/$(IMAGE):$(TAG) .
push: push:
gcloud docker --server=gcr.io -- push $(PREFIX)/$(IMAGE):$(TAG) gcloud docker --server=gcr.io -- push $(PREFIX)/$(IMAGE):$(TAG)

2
cluster/addons/fluentd-elasticsearch/kibana-image/Makefile
View File

@ -18,7 +18,7 @@ TAG = v4.6.1
PREFIX = gcr.io/google_containers PREFIX = gcr.io/google_containers
build: build:
docker build -t $(PREFIX)/kibana:$(TAG) . docker build --pull -t $(PREFIX)/kibana:$(TAG) .
push: push:
gcloud docker -- push $(PREFIX)/kibana:$(TAG) gcloud docker -- push $(PREFIX)/kibana:$(TAG)

2
cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile
View File

@ -29,7 +29,7 @@ PREFIX=gcr.io/google_containers
TAG = 1.31 TAG = 1.31
build: build:
docker build -t $(PREFIX)/fluentd-gcp:$(TAG) . docker build --pull -t $(PREFIX)/fluentd-gcp:$(TAG) .
push: push:

2
cluster/addons/python-image/Makefile
View File

@ -18,7 +18,7 @@ VERSION=v1
.PHONY: build push .PHONY: build push
build: build:
docker build -t "$(IMAGE):$(VERSION)" . docker build --pull -t "$(IMAGE):$(VERSION)" .
push: push:
gcloud docker -- push "$(IMAGE):$(VERSION)" gcloud docker -- push "$(IMAGE):$(VERSION)"

2
cluster/addons/registry/images/Makefile
View File

@ -18,7 +18,7 @@ TAG = 0.4
REPO = gcr.io/google_containers/kube-registry-proxy REPO = gcr.io/google_containers/kube-registry-proxy
build: build:
docker build -t $(REPO):$(TAG) . docker build --pull -t $(REPO):$(TAG) .
push: push:
gcloud docker -- push $(REPO):$(TAG) gcloud docker -- push $(REPO):$(TAG)

2
cluster/images/etcd-empty-dir-cleanup/Makefile
View File

@ -25,7 +25,7 @@ build: clean
curl -L -O https://github.com/coreos/etcd/releases/download/v$(ETCD_VERSION)/etcd-v$(ETCD_VERSION)-linux-amd64.tar.gz curl -L -O https://github.com/coreos/etcd/releases/download/v$(ETCD_VERSION)/etcd-v$(ETCD_VERSION)-linux-amd64.tar.gz
tar xzvf etcd-v$(ETCD_VERSION)-linux-amd64.tar.gz tar xzvf etcd-v$(ETCD_VERSION)-linux-amd64.tar.gz
cp etcd-v$(ETCD_VERSION)-linux-amd64/etcdctl . cp etcd-v$(ETCD_VERSION)-linux-amd64/etcdctl .
docker build -t $(IMAGE):$(TAG) . docker build --pull -t $(IMAGE):$(TAG) .
rm -rf etcdctl etcd-v$(ETCD_VERSION)-linux-amd64 etcd-v$(ETCD_VERSION)-linux-amd64.tar.gz rm -rf etcdctl etcd-v$(ETCD_VERSION)-linux-amd64 etcd-v$(ETCD_VERSION)-linux-amd64.tar.gz
push: build push: build

2
cluster/images/etcd/Makefile
View File

@ -102,7 +102,7 @@ endif
cd $(TEMP_DIR) && sed -i.bak 's|BASEIMAGE|$(BASEIMAGE)|g' Dockerfile cd $(TEMP_DIR) && sed -i.bak 's|BASEIMAGE|$(BASEIMAGE)|g' Dockerfile
# And build the image # And build the image
docker build -t $(REGISTRY)/etcd-$(ARCH):$(REGISTRY_TAG) $(TEMP_DIR) docker build --pull -t $(REGISTRY)/etcd-$(ARCH):$(REGISTRY_TAG) $(TEMP_DIR)
push: build push: build
gcloud docker -- push $(REGISTRY)/etcd-$(ARCH):$(REGISTRY_TAG) gcloud docker -- push $(REGISTRY)/etcd-$(ARCH):$(REGISTRY_TAG)

2
cluster/images/hyperkube/Makefile
View File

@ -106,7 +106,7 @@ endif
# Download CNI # Download CNI
curl -sSL --retry 5 https://storage.googleapis.com/kubernetes-release/network-plugins/cni-${ARCH}-${CNI_RELEASE}.tar.gz | tar -xz -C ${TEMP_DIR}/cni-bin curl -sSL --retry 5 https://storage.googleapis.com/kubernetes-release/network-plugins/cni-${ARCH}-${CNI_RELEASE}.tar.gz | tar -xz -C ${TEMP_DIR}/cni-bin
docker build -t ${REGISTRY}/hyperkube-${ARCH}:${VERSION} ${TEMP_DIR} docker build --pull -t ${REGISTRY}/hyperkube-${ARCH}:${VERSION} ${TEMP_DIR}
rm -rf "${TEMP_DIR}" rm -rf "${TEMP_DIR}"
push: build push: build

2
cluster/images/kube-discovery/Makefile
View File

@ -48,7 +48,7 @@ build:
cp -r ./* ${TEMP_DIR} cp -r ./* ${TEMP_DIR}
cp ../../../_output/dockerized/bin/linux/${ARCH}/kube-discovery ${TEMP_DIR} cp ../../../_output/dockerized/bin/linux/${ARCH}/kube-discovery ${TEMP_DIR}
cd ${TEMP_DIR} && sed -i.back "s|BASEIMAGE|${BASEIMAGE}|g" Dockerfile cd ${TEMP_DIR} && sed -i.back "s|BASEIMAGE|${BASEIMAGE}|g" Dockerfile
docker build -t ${REGISTRY}/kube-discovery-${ARCH}:${VERSION} ${TEMP_DIR} docker build --pull -t ${REGISTRY}/kube-discovery-${ARCH}:${VERSION} ${TEMP_DIR}
rm -rf "${TEMP_DIR}" rm -rf "${TEMP_DIR}"
push: build push: build

2
cluster/images/kubemark/Makefile
View File

@ -16,7 +16,7 @@
# This makefile assumes that the kubemark binary is present in this directory. # This makefile assumes that the kubemark binary is present in this directory.
all: all:
docker build -t gcr.io/$(PROJECT)/kubemark . docker build --pull -t gcr.io/$(PROJECT)/kubemark .
gcloud docker -- push gcr.io/$(PROJECT)/kubemark gcloud docker -- push gcr.io/$(PROJECT)/kubemark
.PHONY: all .PHONY: all

2
examples/cluster-dns/images/backend/Makefile
View File

@ -19,7 +19,7 @@ IMAGE = example-dns-backend
all: push all: push
image: image:
docker build -t $(PREFIX)/$(IMAGE):$(TAG) . docker build --pull -t $(PREFIX)/$(IMAGE):$(TAG) .
push: image push: image
gcloud docker -- push $(PREFIX)/$(IMAGE) gcloud docker -- push $(PREFIX)/$(IMAGE)

2
examples/cluster-dns/images/frontend/Makefile
View File

@ -19,7 +19,7 @@ IMAGE = example-dns-frontend
all: push all: push
image: image:
docker build -t $(PREFIX)/$(IMAGE):$(TAG) . docker build --pull -t $(PREFIX)/$(IMAGE):$(TAG) .
push: image push: image
gcloud docker -- push $(PREFIX)/$(IMAGE) gcloud docker -- push $(PREFIX)/$(IMAGE)

2
examples/explorer/Makefile
View File

@ -21,7 +21,7 @@ explorer: explorer.go
CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-w' ./explorer.go CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-w' ./explorer.go
container: explorer container: explorer
docker build -t gcr.io/google_containers/explorer:$(TAG) . docker build --pull -t gcr.io/google_containers/explorer:$(TAG) .
push: container push: container
gcloud docker -- push gcr.io/google_containers/explorer:$(TAG) gcloud docker -- push gcr.io/google_containers/explorer:$(TAG)

4
examples/guestbook-go/Makefile
View File

@ -24,8 +24,8 @@ release: clean build push clean
# builds a docker image that builds the app and packages it into a minimal docker image # builds a docker image that builds the app and packages it into a minimal docker image
build: build:
@cp ../../bazel-bin/examples/guestbook-go/guestbook-go guestbook_bin @cp ../../bazel-bin/examples/guestbook-go/guestbook-go guestbook_bin
docker build --rm --force-rm -t ${REGISTRY}/guestbook-builder . docker build --pull --rm --force-rm -t ${REGISTRY}/guestbook-builder .
docker run --rm ${REGISTRY}/guestbook-builder | docker build -t "${REGISTRY}/guestbook:${VERSION}" - docker run --rm ${REGISTRY}/guestbook-builder | docker build --pull -t "${REGISTRY}/guestbook:${VERSION}" -
# push the image to an registry # push the image to an registry
push: push:

2
examples/https-nginx/Makefile
View File

@ -28,7 +28,7 @@ secret:
go run make_secret.go -crt $(CERT) -key $(KEY) > $(SECRET) go run make_secret.go -crt $(CERT) -key $(KEY) > $(SECRET)
container: container:
docker build -t $(PREFIX):$(TAG) . docker build --pull -t $(PREFIX):$(TAG) .
push: container push: container
docker push $(PREFIX):$(TAG) docker push $(PREFIX):$(TAG)

2
examples/kubectl-container/Makefile
View File

@ -37,7 +37,7 @@ tag: .tag
container: container:
$(if $(TAG),,$(error TAG is not defined. Use 'make tag' to see a suggestion)) $(if $(TAG),,$(error TAG is not defined. Use 'make tag' to see a suggestion))
docker build -t gcr.io/google_containers/kubectl:$(TAG) . docker build --pull -t gcr.io/google_containers/kubectl:$(TAG) .
push: container push: container
$(if $(TAG),,$(error TAG is not defined. Use 'make tag' to see a suggestion)) $(if $(TAG),,$(error TAG is not defined. Use 'make tag' to see a suggestion))

2
examples/storage/cassandra/image/Makefile
View File

@ -26,7 +26,7 @@ kubernetes-cassandra.jar: ../java/* ../java/src/main/java/io/k8s/cassandra/*.jav
cd ../java && mvn clean cd ../java && mvn clean
build: kubernetes-cassandra.jar build: kubernetes-cassandra.jar
docker build -t ${PROJECT}/cassandra:${VERSION} . docker build --pull -t ${PROJECT}/cassandra:${VERSION} .
push: build push: build
gcloud docker -- push ${PROJECT}/cassandra:${VERSION} gcloud docker -- push ${PROJECT}/cassandra:${VERSION}

2
federation/cluster/common.sh
View File

@ -335,7 +335,7 @@ function push-federation-images {
# TODO(madhusudancs): Remove this code when the new turn up mechanism work # TODO(madhusudancs): Remove this code when the new turn up mechanism work
# is merged. # is merged.
kube::log::status "Building docker image ${docker_image_tag} from the binary" kube::log::status "Building docker image ${docker_image_tag} from the binary"
docker build -q -t "${docker_image_tag}" ${docker_build_path} >/dev/null docker build --pull -q -t "${docker_image_tag}" ${docker_build_path} >/dev/null
rm -rf ${docker_build_path} rm -rf ${docker_build_path}

2
test/e2e_node/conformance/build/Makefile
View File

@ -52,7 +52,7 @@ endif
e2e_node.test \ e2e_node.test \
ginkgo ginkgo
docker build -t ${REGISTRY}/node-test-${ARCH}:${VERSION} ${TEMP_DIR} docker build --pull -t ${REGISTRY}/node-test-${ARCH}:${VERSION} ${TEMP_DIR}
push: build push: build
gcloud docker push ${REGISTRY}/node-test-${ARCH}:${VERSION} gcloud docker push ${REGISTRY}/node-test-${ARCH}:${VERSION}

2
test/images/clusterapi-tester/Makefile
View File

@ -22,7 +22,7 @@ main: main.go
CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-w' -o main ./main.go CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-w' -o main ./main.go
container: main container: main
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
test/images/dnsutils/Makefile
View File

@ -19,7 +19,7 @@ PREFIX ?= gcr.io/google_containers
all: push all: push
image: image:
docker build -t $(PREFIX)/dnsutils . docker build --pull -t $(PREFIX)/dnsutils .
push: image push: image
gcloud docker -- push $(PREFIX)/dnsutils gcloud docker -- push $(PREFIX)/dnsutils

2
test/images/entrypoint-tester/Makefile
View File

@ -21,7 +21,7 @@ ep: ep.go
CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-w' ./ep.go CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-w' ./ep.go
image: ep image: ep
sudo docker build -t $(PREFIX)/eptest:$(TAG) . sudo docker build --pull -t $(PREFIX)/eptest:$(TAG) .
push: image push: image
sudo docker push $(PREFIX)/eptest:$(TAG) sudo docker push $(PREFIX)/eptest:$(TAG)

2
test/images/fakegitserver/Makefile
View File

@ -21,7 +21,7 @@ ARCH = amd64
image: image:
./prepare.sh $(ARCH) ./prepare.sh $(ARCH)
docker build -t $(PREFIX)/$(IMAGE):$(TAG) . docker build --pull -t $(PREFIX)/$(IMAGE):$(TAG) .
push: image push: image
gcloud docker -- push $(PREFIX)/$(IMAGE):$(TAG) gcloud docker -- push $(PREFIX)/$(IMAGE):$(TAG)

2
test/images/goproxy/Makefile
View File

@ -21,7 +21,7 @@ goproxy: goproxy.go
CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-w' ./goproxy.go CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-w' ./goproxy.go
image: goproxy image: goproxy
docker build -t $(PREFIX)/goproxy:$(TAG) . docker build --pull -t $(PREFIX)/goproxy:$(TAG) .
push: image push: image
gcloud docker -- push $(PREFIX)/goproxy:$(TAG) gcloud docker -- push $(PREFIX)/goproxy:$(TAG)

2
test/images/hostexec/Makefile
View File

@ -21,7 +21,7 @@ PREFIX = gcr.io/google_containers
all: push all: push
image: image:
docker build -t $(PREFIX)/hostexec:$(TAG) . docker build --pull -t $(PREFIX)/hostexec:$(TAG) .
push: image push: image
gcloud docker -- push $(PREFIX)/hostexec:$(TAG) gcloud docker -- push $(PREFIX)/hostexec:$(TAG)

2
test/images/iperf/Makefile
View File

@ -21,7 +21,7 @@ all: push
container: image container: image
image: image:
docker build -t $(PREFIX)/${IMAGE} . # Build new image and automatically tag it as latest docker build --pull -t $(PREFIX)/${IMAGE} . # Build new image and automatically tag it as latest
docker tag $(PREFIX)/${IMAGE} $(PREFIX)/${IMAGE}:$(TAG) # Add the version tag to the latest image docker tag $(PREFIX)/${IMAGE} $(PREFIX)/${IMAGE}:$(TAG) # Add the version tag to the latest image
push: image push: image

2
test/images/jessie-dnsutils/Makefile
View File

@ -19,7 +19,7 @@ PREFIX = gcr.io/google_containers
all: push all: push
image: image:
docker build -t $(PREFIX)/jessie-dnsutils . docker build --pull -t $(PREFIX)/jessie-dnsutils .
push: image push: image
gcloud docker -- push $(PREFIX)/jessie-dnsutils gcloud docker -- push $(PREFIX)/jessie-dnsutils

2
test/images/logs-generator/Makefile
View File

@ -23,7 +23,7 @@ binary:
go build -a --ldflags '-w' -o logs-generator . go build -a --ldflags '-w' -o logs-generator .
container: container:
docker build -t $(PREFIX)/logs-generator:$(TAG) . docker build --pull -t $(PREFIX)/logs-generator:$(TAG) .
push: push:
gcloud docker -- push $(PREFIX)/logs-generator:$(TAG) gcloud docker -- push $(PREFIX)/logs-generator:$(TAG)

2
test/images/mount-tester-user/Makefile
View File

@ -18,7 +18,7 @@ PREFIX = gcr.io/google_containers
all: push all: push
image: image:
sudo docker build -t $(PREFIX)/mounttest-user:$(TAG) . sudo docker build --pull -t $(PREFIX)/mounttest-user:$(TAG) .
push: image push: image
gcloud docker -- push $(PREFIX)/mounttest-user:$(TAG) gcloud docker -- push $(PREFIX)/mounttest-user:$(TAG)

2
test/images/mount-tester/Makefile
View File

@ -21,7 +21,7 @@ mt: mt.go
CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-w' ./mt.go CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-w' ./mt.go
image: mt image: mt
sudo docker build -t $(PREFIX)/mounttest:$(TAG) . sudo docker build --pull -t $(PREFIX)/mounttest:$(TAG) .
push: image push: image
gcloud docker -- push $(PREFIX)/mounttest:$(TAG) gcloud docker -- push $(PREFIX)/mounttest:$(TAG)

2
test/images/n-way-http/Makefile
View File

@ -22,7 +22,7 @@ server: server.go
CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-w' -o server ./server.go CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-w' -o server ./server.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
test/images/net/Makefile
View File

@ -25,7 +25,7 @@ net: $(SRCS)
CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-w' CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-w'
image: test net image: test net
docker build -t $(PREFIX)/$(IMAGE):$(TAG) . docker build --pull -t $(PREFIX)/$(IMAGE):$(TAG) .
push: image push: image
gcloud docker -- push $(PREFIX)/$(IMAGE):$(TAG) gcloud docker -- push $(PREFIX)/$(IMAGE):$(TAG)

2
test/images/netexec/Makefile
View File

@ -24,7 +24,7 @@ netexec: netexec.go
CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-w' ./netexec.go CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-w' ./netexec.go
image: netexec image: netexec
docker build -t $(PREFIX)/netexec:$(TAG) . docker build --pull -t $(PREFIX)/netexec:$(TAG) .
push: image push: image
gcloud docker -- push $(PREFIX)/netexec:$(TAG) gcloud docker -- push $(PREFIX)/netexec:$(TAG)

2
test/images/network-tester/Makefile
View File

@ -23,7 +23,7 @@ webserver: webserver.go
container: image container: image
image: webserver image: webserver
docker build -t $(PREFIX)/nettest:$(TAG) . docker build --pull -t $(PREFIX)/nettest:$(TAG) .
push: image push: image
gcloud docker -- push $(PREFIX)/nettest:$(TAG) gcloud docker -- push $(PREFIX)/nettest:$(TAG)

2
test/images/pets/redis/Makefile
View File

@ -18,7 +18,7 @@ TAG = e2e
PREFIX = gcr.io/google_containers/redis-install-3.2.0 PREFIX = gcr.io/google_containers/redis-install-3.2.0
container: container:
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
test/images/pets/zookeeper/Makefile
View File

@ -18,7 +18,7 @@ TAG = e2e
PREFIX = gcr.io/google_containers/zookeeper-install-3.5.0-alpha PREFIX = gcr.io/google_containers/zookeeper-install-3.5.0-alpha
container: container:
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
test/images/port-forward-tester/Makefile
View File

@ -21,7 +21,7 @@ portforwardtester: portforwardtester.go
CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-w' ./portforwardtester.go CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-w' ./portforwardtester.go
image: portforwardtester image: portforwardtester
docker build -t $(PREFIX)/portforwardtester:$(TAG) . docker build --pull -t $(PREFIX)/portforwardtester:$(TAG) .
push: image push: image
gcloud docker -- push $(PREFIX)/portforwardtester:$(TAG) gcloud docker -- push $(PREFIX)/portforwardtester:$(TAG)

2
test/images/porter/Makefile
View File

@ -37,7 +37,7 @@ container: image
image: image:
$(if $(TAG),,$(error TAG is not defined. Use 'make tag' after committing changes to see a suggestion)) $(if $(TAG),,$(error TAG is not defined. Use 'make tag' after committing changes to see a suggestion))
docker build -t $(PREFIX)/porter:$(TAG) . docker build --pull -t $(PREFIX)/porter:$(TAG) .
push: push:
$(if $(TAG),,$(error TAG is not defined. Use 'make tag' after committing changes to see a suggestion)) $(if $(TAG),,$(error TAG is not defined. Use 'make tag' after committing changes to see a suggestion))

4
test/images/resource-consumer/Makefile
View File

@ -25,8 +25,8 @@ consumer:
container: image container: image
image: image:
sudo docker build -t $(PREFIX)/resource_consumer:$(TAG) . sudo docker build --pull -t $(PREFIX)/resource_consumer:$(TAG) .
sudo docker build -t $(PREFIX)/resource_consumer/controller:$(TAG) controller sudo docker build --pull -t $(PREFIX)/resource_consumer/controller:$(TAG) controller
run_container: run_container:
docker run --publish=8080:8080 $(PREFIX)/resource_consumer:$(TAG) docker run --publish=8080:8080 $(PREFIX)/resource_consumer:$(TAG)

2
test/images/serve_hostname/Makefile
View File

@ -86,7 +86,7 @@ container: .container-$(ARCH)
# Set the base image # Set the base image
cd $(TEMP_DIR) && sed -i.bak 's|BASEIMAGE|$(BASEIMAGE)|g' Dockerfile cd $(TEMP_DIR) && sed -i.bak 's|BASEIMAGE|$(BASEIMAGE)|g' Dockerfile
docker build -t $(IMAGE):$(TAG) $(TEMP_DIR) docker build --pull -t $(IMAGE):$(TAG) $(TEMP_DIR)
if [ -n "$(TEST_REGISTRY)" ]; then \ if [ -n "$(TEST_REGISTRY)" ]; then \
docker tag $(IMAGE):$(TAG) $(TEST_IMAGE):$(TAG) ;\ docker tag $(IMAGE):$(TAG) $(TEST_IMAGE):$(TAG) ;\
fi fi

2
test/images/volumes-tester/ceph/Makefile
View File

@ -20,7 +20,7 @@ all: push
container: image container: image
image: image:
docker build -t $(PREFIX)/volume-ceph . # Build new image and automatically tag it as latest docker build --pull -t $(PREFIX)/volume-ceph . # Build new image and automatically tag it as latest
docker tag $(PREFIX)/volume-ceph $(PREFIX)/volume-ceph:$(TAG) # Add the version tag to the latest image docker tag $(PREFIX)/volume-ceph $(PREFIX)/volume-ceph:$(TAG) # Add the version tag to the latest image
push: image push: image

2
test/images/volumes-tester/gluster/Makefile
View File

@ -20,7 +20,7 @@ all: push
container: image container: image
image: image:
docker build -t $(PREFIX)/volume-gluster . # Build new image and automatically tag it as latest docker build --pull -t $(PREFIX)/volume-gluster . # Build new image and automatically tag it as latest
docker tag $(PREFIX)/volume-gluster $(PREFIX)/volume-gluster:$(TAG) # Add the version tag to the latest image docker tag $(PREFIX)/volume-gluster $(PREFIX)/volume-gluster:$(TAG) # Add the version tag to the latest image
push: image push: image

2
test/images/volumes-tester/iscsi/Makefile
View File

@ -21,7 +21,7 @@ container: image
image: image:
# Build new image and automatically tag it as latest # Build new image and automatically tag it as latest
docker build -t $(PREFIX)/volume-iscsi . docker build --pull -t $(PREFIX)/volume-iscsi .
# Add the version tag to the latest image # Add the version tag to the latest image
docker tag $(PREFIX)/volume-iscsi $(PREFIX)/volume-iscsi:$(TAG) docker tag $(PREFIX)/volume-iscsi $(PREFIX)/volume-iscsi:$(TAG)

2
test/images/volumes-tester/nfs/Makefile
View File

@ -20,7 +20,7 @@ all: push
container: image container: image
image: image:
docker build -t $(PREFIX)/volume-nfs . # Build new image and automatically tag it as latest docker build --pull -t $(PREFIX)/volume-nfs . # Build new image and automatically tag it as latest
docker tag $(PREFIX)/volume-nfs $(PREFIX)/volume-nfs:$(TAG) # Add the version tag to the latest image docker tag $(PREFIX)/volume-nfs $(PREFIX)/volume-nfs:$(TAG) # Add the version tag to the latest image
push: image push: image

2
test/images/volumes-tester/rbd/Makefile
View File

@ -21,7 +21,7 @@ container: image
image: image:
# Build new image and automatically tag it as latest # Build new image and automatically tag it as latest
docker build -t $(PREFIX)/volume-rbd . docker build --pull -t $(PREFIX)/volume-rbd .
# Add the version tag to the latest image # Add the version tag to the latest image
docker tag $(PREFIX)/volume-rbd $(PREFIX)/volume-rbd:$(TAG) docker tag $(PREFIX)/volume-rbd $(PREFIX)/volume-rbd:$(TAG)

2
test/soak/cauldron/Makefile
View File

@ -20,7 +20,7 @@ cauldron:
GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -a -installsuffix cgo --ldflags '-w' cauldron.go GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -a -installsuffix cgo --ldflags '-w' cauldron.go
container: cauldron container: cauldron
docker build -t kubernetes/cauldron:$(TAG) . docker build --pull -t kubernetes/cauldron:$(TAG) .
push: push:
docker push kubernetes/cauldron:$(TAG) docker push kubernetes/cauldron:$(TAG)