
Automatic merge from submit-queue Elasticsearch and Kibana update ```release-note Updated Elasticsearch image from version 1.5.1 to version 2.4.1. Updated Kibana image from version 4.0.2 to version 4.6.1. ``` Updated es and kibana images. Made image versions match es/kibana versions they contain. ref #19149
32 lines
1.0 KiB
Makefile
Executable File
32 lines
1.0 KiB
Makefile
Executable File
# 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.
|
|
|
|
.PHONY: elasticsearch_logging_discovery build push
|
|
|
|
# The current value of the tag to be used for building and
|
|
# pushing an image to gcr.io
|
|
TAG = v2.4.1
|
|
|
|
build: elasticsearch_logging_discovery
|
|
docker build -t gcr.io/google_containers/elasticsearch:$(TAG) .
|
|
|
|
push:
|
|
gcloud docker -- push gcr.io/google_containers/elasticsearch:$(TAG)
|
|
|
|
elasticsearch_logging_discovery:
|
|
go build -a -ldflags "-w" elasticsearch_logging_discovery.go
|
|
|
|
clean:
|
|
rm elasticsearch_logging_discovery
|