Skip to content

Fix sigterm #1

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.

Sign up for GitHub

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

Closed
wants to merge 6 commits into from
Closed

Fix sigterm #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7475e2a
Using 1.5.2 version
dkapanidis Feb 3, 2016
e931ede
Added echo and fixed discovery-service in yaml
dkapanidis Feb 3, 2016
8476ce9
Added CMD command
dkapanidis Feb 3, 2016
f7e3b8b
Added NODE_NAME variable
dkapanidis Feb 3, 2016
d21a672
Added EXTRA_OPTS variable
dkapanidis Feb 4, 2016
fe0c7b8
Updated run.sh to use exec
dgil May 2, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM quay.io/pires/docker-elasticsearch:1.7.1-2
FROM quay.io/pires/docker-elasticsearch:1.5.2

MAINTAINER pjpires@gmail.com

Expand All @@ -12,4 +12,6 @@ RUN /elasticsearch/bin/plugin -i io.fabric8/elasticsearch-cloud-kubernetes/1.3.0
ADD elasticsearch.yml /elasticsearch/config/elasticsearch.yml

# Copy run script
COPY run.sh /
COPY run.sh /

CMD ["/run.sh"]
3 changes: 2 additions & 1 deletion elasticsearch.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ cluster:
name: ${CLUSTER_NAME}

node:
name: ${NODE_NAME}
master: ${NODE_MASTER}
data: ${NODE_DATA}

Expand All @@ -17,7 +18,7 @@ http.enabled: ${HTTP_ENABLE}

cloud:
k8s:
service: ${DISCOVERY_SERVICE}
service: elasticsearch-discovery
namespace: ${NAMESPACE}
discovery:
type: io.fabric8.elasticsearch.discovery.k8s.K8sDiscoveryModule
Expand Down
4 changes: 3 additions & 1 deletion run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#!/bin/sh

export CLUSTER_NAME=${CLUSTER_NAME:-elasticsearch-default}
export NODE_NAME=${NODE_NAME:-$HOSTNAME}
export NODE_MASTER=${NODE_MASTER:-true}
export NODE_DATA=${NODE_DATA:-true}
export HTTP_ENABLE=${HTTP_ENABLE:-true}
Expand All @@ -9,4 +10,5 @@ export MULTICAST=${MULTICAST:-false}
export NAMESPACE=${NAMESPACE:-default}
export DISCOVERY_SERVICE=${DISCOVERY_SERVICE:-elasticsearch-discovery}

/elasticsearch/bin/elasticsearch
echo "Discovery is: $DISCOVERY_SERVICE"
exec /elasticsearch/bin/elasticsearch ${EXTRA_OPTS}