aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorDaniel García <[email protected]>2021-08-22 22:14:38 +0200
committerDaniel García <[email protected]>2021-08-22 22:14:38 +0200
commit37525b1e7ebba5c5960f963fa3e7cd25f0f04145 (patch)
tree0c58ecabca37d74458d0657894024544f46d7489 /docker
parentd594b5a266d7876b8879c56c8ac29d5af854d06e (diff)
parentf6bd8b3462dcc77be81f5722c7be82b84478f522 (diff)
downloadvaultwarden-37525b1e7ebba5c5960f963fa3e7cd25f0f04145.tar.gz
vaultwarden-37525b1e7ebba5c5960f963fa3e7cd25f0f04145.zip
Merge branch 'fix-timezone-alpine-container' of https://github.com/mrckndt/vaultwarden into mrckndt-fix-timezone-alpine-container
Diffstat (limited to 'docker')
-rw-r--r--docker/Dockerfile.j21
-rw-r--r--docker/amd64/Dockerfile.alpine1
-rw-r--r--docker/armv7/Dockerfile.alpine1
3 files changed, 3 insertions, 0 deletions
diff --git a/docker/Dockerfile.j2 b/docker/Dockerfile.j2
index f3031cd9..52109775 100644
--- 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
index 22b159d1..64963b99 100644
--- 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
index 6a42d23e..a6ca1582 100644
--- 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