From e940edc79fc6c1b74c0034c1463d48ee906e5515 Mon Sep 17 00:00:00 2001 From: Leonard Gram Date: Wed, 30 Oct 2019 09:33:27 +0100 Subject: [PATCH] Docker: makes it possible to parse timezones in the docker image (#20081) --- Dockerfile | 2 +- packaging/docker/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index cf33cfc5525..b1759f9f470 100644 --- a/Dockerfile +++ b/Dockerfile @@ -62,7 +62,7 @@ ENV PATH=/usr/share/grafana/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bi WORKDIR $GF_PATHS_HOME -RUN apk add --no-cache ca-certificates bash && \ +RUN apk add --no-cache ca-certificates bash tzdata && \ apk add --no-cache --upgrade --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main openssl musl-utils COPY conf ./conf diff --git a/packaging/docker/Dockerfile b/packaging/docker/Dockerfile index 418b1c0536b..3e6ddba6fe0 100644 --- a/packaging/docker/Dockerfile +++ b/packaging/docker/Dockerfile @@ -23,7 +23,7 @@ ENV PATH=/usr/share/grafana/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bi WORKDIR $GF_PATHS_HOME -RUN apk add --no-cache ca-certificates bash && \ +RUN apk add --no-cache ca-certificates bash tzdata && \ apk add --no-cache --upgrade --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main openssl musl-utils # PhantomJS