cde5559d09
We can then avoid the following warning: ``` WARNING: The '--' argument must be specified between gcloud specific args on the left and DOCKER_ARGS on the right. IMPORTANT: previously, commands allowed the omission of the --, and unparsed arguments were treated as implementation args. This usage is being deprecated and will be removed in March 2017. This will be strictly enforced in March 2017. Use 'gcloud beta docker' to see new behavior. ``` Signed-off-by: Jess Frazelle <acidburn@google.com>
51 lines
1.7 KiB
Makefile
51 lines
1.7 KiB
Makefile
# Copyright 2016 The Kubernetes Authors.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
# The build rule builds a Docker image that logs all Docker contains logs to
|
|
# Google Compute Platform using the Cloud Logging API. The push rule pushes
|
|
# the image to DockerHub.
|
|
|
|
# Procedure for change:
|
|
# 1. Bump the tag number.
|
|
# 2. Create an image for the kubernetes user on Dockerhub and push there: make kbuild kpush
|
|
# 3. Temporarily adjust any config files etc. that reference gcr.io/google_containers/fluentd-gcp:$(TAG)
|
|
# to use kubernetes/fluentd-gcp:$(TAG) instead.
|
|
# 4. Test etc.
|
|
# 5. Issue PR.
|
|
# 6. When PR is approved make the gcr.io version of the image: make build push
|
|
# 7. Revert the referendes to kubernetes/fluentd-gcp:$(TAG) to gcr.io/google_containers/fluentd-gcp:$(TAG)
|
|
|
|
.PHONY: kbuild kpush
|
|
|
|
TAG = 1.25
|
|
|
|
# Rules for building the test image for deployment to Dockerhub with user kubernetes.
|
|
|
|
kbuild:
|
|
docker build -t kubernetes/fluentd-gcp:$(TAG) .
|
|
|
|
|
|
kpush:
|
|
docker push kubernetes/fluentd-gcp:$(TAG)
|
|
|
|
|
|
# Rules for building the real image for deployment to gcr.io
|
|
|
|
build:
|
|
docker build -t gcr.io/google_containers/fluentd-gcp:$(TAG) .
|
|
|
|
|
|
push:
|
|
gcloud docker -- push gcr.io/google_containers/fluentd-gcp:$(TAG)
|