Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make a Kubernetes specific version of an Elasticsearch Docker container #4762

Merged
merged 1 commit into from
Feb 26, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion cluster/addons/fluentd-elasticsearch/es-controller.yaml.in
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ desiredState:
id: es-log-ingestion
containers:
- name: elasticsearch-logging
image: dockerfile/elasticsearch
image: kubernetes/elasticsearch:1.0
ports:
- name: es-port
containerPort: 9200
Expand Down
27 changes: 27 additions & 0 deletions cluster/addons/fluentd-elasticsearch/es-image/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# A Dockerfile for creating an Elasticsearch instance that is designed
# to work with Kubernetes logging. Inspired by the Dockerfile
# dockerfile/elasticsearch

FROM dockerfile/java:openjdk-7-jre
MAINTAINER Satnam Singh "satnam@google.com"

ENV DEBIAN_FRONTEND noninteractive

RUN apt-get update && \
apt-get install -y curl && \
apt-get clean

RUN cd / && \
curl -O https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-1.4.4.tar.gz && \
tar xf elasticsearch-1.4.4.tar.gz && \
mv elasticsearch-1.4.4 /elasticsearch && \
rm -rf elasticsearch-1.4.4.tar.gz

ADD elasticsearch.yml /elasticsearch/config/elasticsearch.yml

VOLUME ["/data"]
WORKDIR /data
CMD ["/elasticsearch/bin/elasticsearch"]

EXPOSE 9200
EXPOSE 9300
9 changes: 9 additions & 0 deletions cluster/addons/fluentd-elasticsearch/es-image/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
.PHONY: build push

TAG = 1.0

build:
docker build -t kubernetes/elasticsearch:$(TAG) .

push:
docker push kubernetes/elasticsearch:$(TAG)
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
path:
data: /data/data
logs: /data/log
plugins: /data/plugins
work: /data/work
cluster:
name: kubernetes_logging