Browse Source
Merge branch 'mrckndt-fix-timezone-alpine-container' into main
pull/1945/head
Daniel García
4 years ago
No known key found for this signature in database
GPG Key ID: FC8A7D14C3CD543A
3 changed files with
3 additions and
0 deletions
-
docker/Dockerfile.j2
-
docker/amd64/Dockerfile.alpine
-
docker/armv7/Dockerfile.alpine
|
|
|
@ -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 %} |
|
|
|
|
|
|
|
@ -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 \ |
|
|
|
|
|
|
|
@ -88,6 +88,7 @@ RUN [ "cross-build-start" ] |
|
|
|
RUN mkdir /data \ |
|
|
|
&& apk add --no-cache \ |
|
|
|
openssl \ |
|
|
|
tzdata \ |
|
|
|
curl \ |
|
|
|
dumb-init \ |
|
|
|
ca-certificates |
|
|
|
|
