Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
19aafd29
Commit
19aafd29
authored
Jan 10, 2017
by
Jeff Grafton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Always --pull in docker build to ensure recent base images
parent
add3a08a
Hide whitespace changes
Inline
Side-by-side
Showing
52 changed files
with
55 additions
and
56 deletions
+55
-56
Makefile
build/build-image/cross/Makefile
+1
-1
Makefile
build/debian-iptables/Makefile
+1
-1
release.sh
build/lib/release.sh
+1
-1
Makefile
build/pause/Makefile
+1
-1
Makefile
cluster/addons/addon-manager/Makefile
+1
-1
Makefile
cluster/addons/fluentd-elasticsearch/es-image/Makefile
+1
-1
Makefile
...er/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
+1
-1
Makefile
cluster/addons/fluentd-elasticsearch/kibana-image/Makefile
+1
-1
Makefile
cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile
+1
-1
Makefile
cluster/addons/python-image/Makefile
+1
-1
Makefile
cluster/addons/registry/images/Makefile
+1
-1
Makefile
cluster/images/etcd-empty-dir-cleanup/Makefile
+1
-1
Makefile
cluster/images/etcd/Makefile
+1
-1
Makefile
cluster/images/hyperkube/Makefile
+1
-1
Makefile
cluster/images/kube-discovery/Makefile
+1
-1
Makefile
cluster/images/kubemark/Makefile
+1
-1
Makefile
examples/cluster-dns/images/backend/Makefile
+1
-1
Makefile
examples/cluster-dns/images/frontend/Makefile
+1
-1
Makefile
examples/explorer/Makefile
+1
-1
Makefile
examples/guestbook-go/Makefile
+2
-2
Makefile
examples/https-nginx/Makefile
+1
-1
Makefile
examples/kubectl-container/Makefile
+1
-1
Makefile
examples/storage/cassandra/image/Makefile
+1
-1
common.sh
federation/cluster/common.sh
+1
-1
Makefile
test/e2e_node/conformance/build/Makefile
+1
-1
Makefile
test/images/clusterapi-tester/Makefile
+1
-1
Makefile
test/images/dnsutils/Makefile
+1
-1
Makefile
test/images/entrypoint-tester/Makefile
+1
-1
Makefile
test/images/fakegitserver/Makefile
+1
-1
Makefile
test/images/goproxy/Makefile
+1
-1
Makefile
test/images/hostexec/Makefile
+1
-1
Makefile
test/images/iperf/Makefile
+1
-1
Makefile
test/images/jessie-dnsutils/Makefile
+1
-1
Makefile
test/images/logs-generator/Makefile
+2
-3
Makefile
test/images/mount-tester-user/Makefile
+1
-1
Makefile
test/images/mount-tester/Makefile
+1
-1
Makefile
test/images/n-way-http/Makefile
+1
-1
Makefile
test/images/net/Makefile
+1
-1
Makefile
test/images/netexec/Makefile
+1
-1
Makefile
test/images/network-tester/Makefile
+1
-1
Makefile
test/images/pets/redis/Makefile
+1
-1
Makefile
test/images/pets/zookeeper/Makefile
+1
-1
Makefile
test/images/port-forward-tester/Makefile
+1
-1
Makefile
test/images/porter/Makefile
+1
-1
Makefile
test/images/resource-consumer/Makefile
+2
-2
Makefile
test/images/serve_hostname/Makefile
+1
-1
Makefile
test/images/volumes-tester/ceph/Makefile
+1
-1
Makefile
test/images/volumes-tester/gluster/Makefile
+1
-1
Makefile
test/images/volumes-tester/iscsi/Makefile
+1
-1
Makefile
test/images/volumes-tester/nfs/Makefile
+1
-1
Makefile
test/images/volumes-tester/rbd/Makefile
+1
-1
Makefile
test/soak/cauldron/Makefile
+1
-1
No files found.
build/build-image/cross/Makefile
View file @
19aafd29
...
@@ -21,7 +21,7 @@ TAG=$(shell cat VERSION)
...
@@ -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)
build/debian-iptables/Makefile
View file @
19aafd29
...
@@ -56,7 +56,7 @@ else
...
@@ -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)
...
...
build/lib/release.sh
View file @
19aafd29
...
@@ -295,7 +295,7 @@ function kube::release::create_docker_images_for_server() {
...
@@ -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
...
...
build/pause/Makefile
View file @
19aafd29
...
@@ -78,7 +78,7 @@ bin/$(BIN)-$(ARCH): $(SRCS)
...
@@ -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)
...
...
cluster/addons/addon-manager/Makefile
View file @
19aafd29
...
@@ -43,7 +43,7 @@ build:
...
@@ -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)
...
...
cluster/addons/fluentd-elasticsearch/es-image/Makefile
View file @
19aafd29
...
@@ -19,7 +19,7 @@
...
@@ -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)
...
...
cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
View file @
19aafd29
...
@@ -19,7 +19,7 @@ IMAGE = fluentd-elasticsearch
...
@@ -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)
cluster/addons/fluentd-elasticsearch/kibana-image/Makefile
View file @
19aafd29
...
@@ -18,7 +18,7 @@ TAG = v4.6.1
...
@@ -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)
cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile
View file @
19aafd29
...
@@ -29,7 +29,7 @@ PREFIX=gcr.io/google_containers
...
@@ -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
:
...
...
cluster/addons/python-image/Makefile
View file @
19aafd29
...
@@ -18,7 +18,7 @@ VERSION=v1
...
@@ -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)
"
...
...
cluster/addons/registry/images/Makefile
View file @
19aafd29
...
@@ -18,7 +18,7 @@ TAG = 0.4
...
@@ -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)
cluster/images/etcd-empty-dir-cleanup/Makefile
View file @
19aafd29
...
@@ -25,7 +25,7 @@ build: clean
...
@@ -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
...
...
cluster/images/etcd/Makefile
View file @
19aafd29
...
@@ -102,7 +102,7 @@ endif
...
@@ -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)
...
...
cluster/images/hyperkube/Makefile
View file @
19aafd29
...
@@ -106,7 +106,7 @@ endif
...
@@ -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
...
...
cluster/images/kube-discovery/Makefile
View file @
19aafd29
...
@@ -48,7 +48,7 @@ build:
...
@@ -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
...
...
cluster/images/kubemark/Makefile
View file @
19aafd29
...
@@ -16,7 +16,7 @@
...
@@ -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
examples/cluster-dns/images/backend/Makefile
View file @
19aafd29
...
@@ -19,7 +19,7 @@ IMAGE = example-dns-backend
...
@@ -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)
...
...
examples/cluster-dns/images/frontend/Makefile
View file @
19aafd29
...
@@ -19,7 +19,7 @@ IMAGE = example-dns-frontend
...
@@ -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)
...
...
examples/explorer/Makefile
View file @
19aafd29
...
@@ -21,7 +21,7 @@ explorer: explorer.go
...
@@ -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)
...
...
examples/guestbook-go/Makefile
View file @
19aafd29
...
@@ -24,8 +24,8 @@ release: clean build push clean
...
@@ -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
:
...
...
examples/https-nginx/Makefile
View file @
19aafd29
...
@@ -28,7 +28,7 @@ secret:
...
@@ -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)
...
...
examples/kubectl-container/Makefile
View file @
19aafd29
...
@@ -37,7 +37,7 @@ tag: .tag
...
@@ -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
))
...
...
examples/storage/cassandra/image/Makefile
View file @
19aafd29
...
@@ -26,7 +26,7 @@ kubernetes-cassandra.jar: ../java/* ../java/src/main/java/io/k8s/cassandra/*.jav
...
@@ -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
}
...
...
federation/cluster/common.sh
View file @
19aafd29
...
@@ -335,7 +335,7 @@ function push-federation-images {
...
@@ -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
}
...
...
test/e2e_node/conformance/build/Makefile
View file @
19aafd29
...
@@ -52,7 +52,7 @@ endif
...
@@ -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
}
...
...
test/images/clusterapi-tester/Makefile
View file @
19aafd29
...
@@ -22,7 +22,7 @@ main: main.go
...
@@ -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)
...
...
test/images/dnsutils/Makefile
View file @
19aafd29
...
@@ -19,7 +19,7 @@ PREFIX ?= gcr.io/google_containers
...
@@ -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
...
...
test/images/entrypoint-tester/Makefile
View file @
19aafd29
...
@@ -21,7 +21,7 @@ ep: ep.go
...
@@ -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)
...
...
test/images/fakegitserver/Makefile
View file @
19aafd29
...
@@ -21,7 +21,7 @@ ARCH = amd64
...
@@ -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)
...
...
test/images/goproxy/Makefile
View file @
19aafd29
...
@@ -21,7 +21,7 @@ goproxy: goproxy.go
...
@@ -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)
...
...
test/images/hostexec/Makefile
View file @
19aafd29
...
@@ -21,7 +21,7 @@ PREFIX = gcr.io/google_containers
...
@@ -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)
...
...
test/images/iperf/Makefile
View file @
19aafd29
...
@@ -21,7 +21,7 @@ all: push
...
@@ -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
...
...
test/images/jessie-dnsutils/Makefile
View file @
19aafd29
...
@@ -19,7 +19,7 @@ PREFIX = gcr.io/google_containers
...
@@ -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
...
...
test/images/logs-generator/Makefile
View file @
19aafd29
...
@@ -23,10 +23,10 @@ binary:
...
@@ -23,10 +23,10 @@ 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)
clean
:
clean
:
rm
-f
logs-generator
rm
-f
logs-generator
\ No newline at end of file
test/images/mount-tester-user/Makefile
View file @
19aafd29
...
@@ -18,7 +18,7 @@ PREFIX = gcr.io/google_containers
...
@@ -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)
...
...
test/images/mount-tester/Makefile
View file @
19aafd29
...
@@ -21,7 +21,7 @@ mt: mt.go
...
@@ -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)
...
...
test/images/n-way-http/Makefile
View file @
19aafd29
...
@@ -22,7 +22,7 @@ server: server.go
...
@@ -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)
...
...
test/images/net/Makefile
View file @
19aafd29
...
@@ -25,7 +25,7 @@ net: $(SRCS)
...
@@ -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)
...
...
test/images/netexec/Makefile
View file @
19aafd29
...
@@ -24,7 +24,7 @@ netexec: netexec.go
...
@@ -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)
...
...
test/images/network-tester/Makefile
View file @
19aafd29
...
@@ -23,7 +23,7 @@ webserver: webserver.go
...
@@ -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)
...
...
test/images/pets/redis/Makefile
View file @
19aafd29
...
@@ -18,7 +18,7 @@ TAG = e2e
...
@@ -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)
...
...
test/images/pets/zookeeper/Makefile
View file @
19aafd29
...
@@ -18,7 +18,7 @@ TAG = e2e
...
@@ -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)
...
...
test/images/port-forward-tester/Makefile
View file @
19aafd29
...
@@ -21,7 +21,7 @@ portforwardtester: portforwardtester.go
...
@@ -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)
...
...
test/images/porter/Makefile
View file @
19aafd29
...
@@ -37,7 +37,7 @@ container: image
...
@@ -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
))
...
...
test/images/resource-consumer/Makefile
View file @
19aafd29
...
@@ -25,8 +25,8 @@ consumer:
...
@@ -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)
...
...
test/images/serve_hostname/Makefile
View file @
19aafd29
...
@@ -86,7 +86,7 @@ container: .container-$(ARCH)
...
@@ -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
...
...
test/images/volumes-tester/ceph/Makefile
View file @
19aafd29
...
@@ -20,7 +20,7 @@ all: push
...
@@ -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
...
...
test/images/volumes-tester/gluster/Makefile
View file @
19aafd29
...
@@ -20,7 +20,7 @@ all: push
...
@@ -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
...
...
test/images/volumes-tester/iscsi/Makefile
View file @
19aafd29
...
@@ -21,7 +21,7 @@ container: image
...
@@ -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)
...
...
test/images/volumes-tester/nfs/Makefile
View file @
19aafd29
...
@@ -20,7 +20,7 @@ all: push
...
@@ -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
...
...
test/images/volumes-tester/rbd/Makefile
View file @
19aafd29
...
@@ -21,7 +21,7 @@ container: image
...
@@ -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)
...
...
test/soak/cauldron/Makefile
View file @
19aafd29
...
@@ -20,7 +20,7 @@ cauldron:
...
@@ -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)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment