From 458455245fd38fa5df73d13d74e2fa0b51d4cbb4 Mon Sep 17 00:00:00 2001 From: Ben Kochie Date: Mon, 10 Dec 2018 09:19:01 +0100 Subject: [PATCH] Fix Dockerfile entrypoint (#4976) * Fix Dockerfile entrypoint Fix WORKDIR and use symlink to setup working defaults for config flags. Signed-off-by: Ben Kochie * Collapse Dockrefile RUNs Signed-off-by: Ben Kochie --- Dockerfile | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index b04e660932..c3ff6454e0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,16 +7,13 @@ COPY documentation/examples/prometheus.yml /etc/prometheus/prometheus.yml COPY console_libraries/ /usr/share/prometheus/console_libraries/ COPY consoles/ /usr/share/prometheus/consoles/ -RUN ln -s /usr/share/prometheus/console_libraries /usr/share/prometheus/consoles/ /etc/prometheus/ -RUN mkdir -p /prometheus && \ - chown -R nobody:nogroup etc/prometheus /prometheus +RUN ln -s /usr/share/prometheus/console_libraries /usr/share/prometheus/consoles/ /etc/prometheus/ && \ + mkdir -p /prometheus && \ + chown -R nobody:nogroup etc/prometheus /prometheus && \ + ln -s /prometheus /etc/prometheus/data USER nobody EXPOSE 9090 VOLUME [ "/prometheus" ] -WORKDIR /prometheus -ENTRYPOINT [ "/bin/prometheus", \ - "--storage.tsdb.path=/prometheus", \ - "--web.console.libraries=/etc/prometheus/console_libraries", \ - "--web.console.templates=/etc/prometheus/consoles", \ - "--config.file=/etc/prometheus/prometheus.yml" ] +WORKDIR /etc/prometheus +ENTRYPOINT [ "/bin/prometheus" ]