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

Merge pull request #7455 from satnam6502/es-image 

Upgrade Elasticsearch to 1.5.2 for cluster logging
pull/6/head
Alex Robinson 2015-04-28 16:37:22 -07:00
parent f8569dc5d3 dc31c58443
commit 5773d993f0
3 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cluster/addons/fluentd-elasticsearch/es-image/Dockerfile
View File

@ -12,16 +12,17 @@ RUN apt-get update && \
apt-get clean apt-get clean
RUN cd / && \ RUN cd / && \
curl -O https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-1.4.4.tar.gz && \ curl -O https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-1.5.2.tar.gz && \
tar xf elasticsearch-1.4.4.tar.gz && \ tar xf elasticsearch-1.5.2.tar.gz && \
mv elasticsearch-1.4.4 /elasticsearch && \ mv elasticsearch-1.5.2 /elasticsearch && \
rm -rf elasticsearch-1.4.4.tar.gz rm elasticsearch-1.5.2.tar.gz
ADD elasticsearch.yml /elasticsearch/config/elasticsearch.yml ADD elasticsearch.yml /elasticsearch/config/elasticsearch.yml
VOLUME ["/data"] VOLUME ["/data"]
WORKDIR /data WORKDIR /data
CMD ["/elasticsearch/bin/elasticsearch"]
EXPOSE 9200 EXPOSE 9200
EXPOSE 9300 EXPOSE 9300
CMD ["/elasticsearch/bin/elasticsearch"]

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

@ -1,9 +1,9 @@
.PHONY: build push .PHONY: build push
TAG = 1.0 TAG = 1.1
build: build:
docker build -t gcr.io/google_containers/elasticsearch:$(TAG) . docker build -t gcr.io/google_containers/elasticsearch:$(TAG) .
push: push:
docker push gcr.io/google_containers/elasticsearch:$(TAG) gcloud preview docker push gcr.io/google_containers/elasticsearch:$(TAG)

15
cluster/addons/fluentd-elasticsearch/es-image/elasticsearch.yml
View File

@ -1,7 +1,8 @@
path: # These are the Kubernetes-specific settings that differ
data: /data/data # from the default values.
logs: /data/log cluster.name: kubernetes_logging
plugins: /data/plugins
work: /data/work path.data: /data/data
cluster: path.work: /data/work
name: kubernetes_logging path.logs: /data/logs
path.plugins: /data/plugins