commit 37525b1e7ebba5c5960f963fa3e7cd25f0f04145
parent d594b5a266d7876b8879c56c8ac29d5af854d06e
Author: Daniel GarcĂa <dani-garcia@users.noreply.github.com>
Date: Sun, 22 Aug 2021 22:14:38 +0200
Merge branch 'fix-timezone-alpine-container' of https://github.com/mrckndt/vaultwarden into mrckndt-fix-timezone-alpine-container
Diffstat:
3 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/docker/Dockerfile.j2 b/docker/Dockerfile.j2
@@ -212,6 +212,7 @@ RUN mkdir /data \
{% if "alpine" in runtime_stage_base_image %}
&& apk add --no-cache \
openssl \
+ tzdata \
curl \
dumb-init \
{% if "mysql" in features %}
diff --git a/docker/amd64/Dockerfile.alpine b/docker/amd64/Dockerfile.alpine
@@ -82,6 +82,7 @@ ENV SSL_CERT_DIR=/etc/ssl/certs
RUN mkdir /data \
&& apk add --no-cache \
openssl \
+ tzdata \
curl \
dumb-init \
postgresql-libs \
diff --git a/docker/armv7/Dockerfile.alpine b/docker/armv7/Dockerfile.alpine
@@ -88,6 +88,7 @@ RUN [ "cross-build-start" ]
RUN mkdir /data \
&& apk add --no-cache \
openssl \
+ tzdata \
curl \
dumb-init \
ca-certificates