From bb6902febff54be94c50dbadc1d2d0ffa5cd53bf Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Wed, 27 Jan 2016 15:46:32 -0800 Subject: [PATCH] Resync entrypoint/Dockerfile to 4.0+4.1 --- 4.0/Dockerfile | 3 ++- 4.0/docker-entrypoint.sh | 2 +- 4.1/Dockerfile | 3 ++- 4.1/docker-entrypoint.sh | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/4.0/Dockerfile b/4.0/Dockerfile index 83d0e1e..6a0e6f9 100644 --- a/4.0/Dockerfile +++ b/4.0/Dockerfile @@ -1,7 +1,7 @@ FROM debian:jessie # add our user and group first to make sure their IDs get assigned consistently -RUN groupadd -r kibana && useradd -r -g kibana kibana +RUN groupadd -r kibana && useradd -r -m -g kibana kibana RUN apt-get update && apt-get install -y ca-certificates curl --no-install-recommends && rm -rf /var/lib/apt/lists/* @@ -23,6 +23,7 @@ RUN set -x \ && echo "${KIBANA_SHA1} kibana.tar.gz" | sha1sum -c - \ && mkdir -p /opt/kibana \ && tar -xz --strip-components=1 -C /opt/kibana -f kibana.tar.gz \ + && chown -R kibana:kibana /opt/kibana \ && rm kibana.tar.gz ENV PATH /opt/kibana/bin:$PATH diff --git a/4.0/docker-entrypoint.sh b/4.0/docker-entrypoint.sh index 267afd8..f8ef0cb 100755 --- a/4.0/docker-entrypoint.sh +++ b/4.0/docker-entrypoint.sh @@ -11,7 +11,7 @@ fi if [ "$1" = 'kibana' ]; then if [ "$ELASTICSEARCH_URL" -o "$ELASTICSEARCH_PORT_9200_TCP" ]; then : ${ELASTICSEARCH_URL:='http://elasticsearch:9200'} - sed -ri "s!^(elasticsearch_url:).*!\1 '$ELASTICSEARCH_URL'!" /opt/kibana/config/kibana.yml + sed -ri "s!^(\#\s*)?(elasticsearch_url:).*!\2 '$ELASTICSEARCH_URL'!" /opt/kibana/config/kibana.yml else echo >&2 'warning: missing ELASTICSEARCH_PORT_9200_TCP or ELASTICSEARCH_URL' echo >&2 ' Did you forget to --link some-elasticsearch:elasticsearch' diff --git a/4.1/Dockerfile b/4.1/Dockerfile index 5fd33e6..83951b9 100644 --- a/4.1/Dockerfile +++ b/4.1/Dockerfile @@ -1,7 +1,7 @@ FROM debian:jessie # add our user and group first to make sure their IDs get assigned consistently -RUN groupadd -r kibana && useradd -r -g kibana kibana +RUN groupadd -r kibana && useradd -r -m -g kibana kibana RUN apt-get update && apt-get install -y ca-certificates curl --no-install-recommends && rm -rf /var/lib/apt/lists/* @@ -23,6 +23,7 @@ RUN set -x \ && echo "${KIBANA_SHA1} kibana.tar.gz" | sha1sum -c - \ && mkdir -p /opt/kibana \ && tar -xz --strip-components=1 -C /opt/kibana -f kibana.tar.gz \ + && chown -R kibana:kibana /opt/kibana \ && rm kibana.tar.gz ENV PATH /opt/kibana/bin:$PATH diff --git a/4.1/docker-entrypoint.sh b/4.1/docker-entrypoint.sh index 267afd8..f8ef0cb 100755 --- a/4.1/docker-entrypoint.sh +++ b/4.1/docker-entrypoint.sh @@ -11,7 +11,7 @@ fi if [ "$1" = 'kibana' ]; then if [ "$ELASTICSEARCH_URL" -o "$ELASTICSEARCH_PORT_9200_TCP" ]; then : ${ELASTICSEARCH_URL:='http://elasticsearch:9200'} - sed -ri "s!^(elasticsearch_url:).*!\1 '$ELASTICSEARCH_URL'!" /opt/kibana/config/kibana.yml + sed -ri "s!^(\#\s*)?(elasticsearch_url:).*!\2 '$ELASTICSEARCH_URL'!" /opt/kibana/config/kibana.yml else echo >&2 'warning: missing ELASTICSEARCH_PORT_9200_TCP or ELASTICSEARCH_URL' echo >&2 ' Did you forget to --link some-elasticsearch:elasticsearch'