From cfe77c9a36b34fea700863c3ff8f98df3be589d8 Mon Sep 17 00:00:00 2001 From: Jason Kulatunga Date: Sat, 30 Apr 2022 21:29:45 -0700 Subject: [PATCH] install tzdata package everywhere. fixes #78 fixes --- docker/Dockerfile | 2 +- docker/Dockerfile.collector | 2 +- docker/Dockerfile.web | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index d1bda0c..2e37fba 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -32,7 +32,7 @@ WORKDIR /scrutiny ENV PATH="/scrutiny/bin:${PATH}" ENV INFLUXD_CONFIG_PATH=/scrutiny/influxdb -RUN apt-get update && apt-get install -y cron smartmontools=7.0-0ubuntu1~ubuntu18.04.1 ca-certificates curl && update-ca-certificates +RUN apt-get update && apt-get install -y cron smartmontools=7.0-0ubuntu1~ubuntu18.04.1 ca-certificates curl tzdata && update-ca-certificates ADD https://github.com/just-containers/s6-overlay/releases/download/v1.21.8.0/s6-overlay-amd64.tar.gz /tmp/ RUN tar xzf /tmp/s6-overlay-amd64.tar.gz -C / diff --git a/docker/Dockerfile.collector b/docker/Dockerfile.collector index 32361ba..76bf838 100644 --- a/docker/Dockerfile.collector +++ b/docker/Dockerfile.collector @@ -14,7 +14,7 @@ FROM ubuntu:bionic as runtime WORKDIR /scrutiny ENV PATH="/scrutiny/bin:${PATH}" -RUN apt-get update && apt-get install -y cron smartmontools=7.0-0ubuntu1~ubuntu18.04.1 ca-certificates && update-ca-certificates +RUN apt-get update && apt-get install -y cron smartmontools=7.0-0ubuntu1~ubuntu18.04.1 ca-certificates tzdata && update-ca-certificates COPY /docker/entrypoint-collector.sh /entrypoint-collector.sh COPY /rootfs/etc/cron.d/scrutiny /etc/cron.d/scrutiny diff --git a/docker/Dockerfile.web b/docker/Dockerfile.web index c9174a7..e942b5f 100644 --- a/docker/Dockerfile.web +++ b/docker/Dockerfile.web @@ -29,7 +29,7 @@ EXPOSE 8080 WORKDIR /scrutiny ENV PATH="/scrutiny/bin:${PATH}" -RUN apt-get update && apt-get install -y ca-certificates curl && update-ca-certificates +RUN apt-get update && apt-get install -y ca-certificates curl tzdata && update-ca-certificates COPY --from=backendbuild /go/src/github.com/analogj/scrutiny/scrutiny /scrutiny/bin/ COPY --from=frontendbuild /scrutiny/dist /scrutiny/web