Add tzdata to docker images to allow setting timezone

Closes eclipse-mosquitto#3040
CoRfr · Nov 1, 2024 · ba2b98d · ba2b98d
1 parent 6ff72b8
commit ba2b98d
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 8 deletions.
diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -13,6 +13,7 @@ Client library:
 
 Build:
 - Fix Windows builds not having websockets enabled.
+- Add tzdata to docker images
 
 
 2.0.20 - 2024-10-16

diff --git a/docker/1.5-openssl/Dockerfile b/docker/1.5-openssl/Dockerfile
@@ -82,7 +82,9 @@ RUN set -x && \
     install -m644 /build/mosq/mosquitto.conf /mosquitto/config/mosquitto.conf && \
     chown -R mosquitto:mosquitto /mosquitto && \
     apk --no-cache add \
-        ca-certificates libuuid && \
+        ca-certificates \
+        libuuid \
+        tzdata && \
     apk del build-deps && \
     rm -rf /build
 

diff --git a/docker/1.5/Dockerfile b/docker/1.5/Dockerfile
@@ -82,7 +82,8 @@ RUN set -x && \
     apk --no-cache add \
         ca-certificates \
         libressl \
-        libuuid && \
+        libuuid \
+        tzdata && \
     apk del build-deps && \
     rm -rf /build
 

diff --git a/docker/1.6-openssl/Dockerfile b/docker/1.6-openssl/Dockerfile
@@ -86,7 +86,8 @@ RUN set -x && \
     install -Dm644 /build/mosq/edl-v10 /usr/share/licenses/mosquitto/edl-v10 && \
     chown -R mosquitto:mosquitto /mosquitto && \
     apk --no-cache add \
-        ca-certificates && \
+        ca-certificates \
+        tzdata && \
     apk del build-deps && \
     rm -rf /build
 

diff --git a/docker/1.6/Dockerfile b/docker/1.6/Dockerfile
@@ -88,7 +88,8 @@ RUN set -x && \
     chown -R mosquitto:mosquitto /mosquitto && \
     apk --no-cache add \
         ca-certificates \
-        libressl && \
+        libressl \
+        tzdata && \
     apk del build-deps && \
     rm -rf /build
 

diff --git a/docker/2.0-openssl/Dockerfile b/docker/2.0-openssl/Dockerfile
@@ -90,7 +90,8 @@ RUN set -x && \
     chown -R mosquitto:mosquitto /mosquitto && \
     apk --no-cache add \
         ca-certificates \
-        cjson && \
+        cjson \
+        tzdata && \
     apk del build-deps && \
     rm -rf /build
 

diff --git a/docker/2.0/Dockerfile b/docker/2.0/Dockerfile
@@ -92,7 +92,8 @@ RUN set -x && \
     apk --no-cache add \
         ca-certificates \
         cjson \
-        libressl && \
+        libressl \
+        tzdata && \
     apk del build-deps && \
     rm -rf /build
 

diff --git a/docker/generic/Dockerfile b/docker/generic/Dockerfile
@@ -108,7 +108,8 @@ RUN set -x && \
     install -Dm644 /build/mosq/edl-v10 /usr/share/licenses/mosquitto/edl-v10 && \
     chown -R mosquitto:mosquitto /mosquitto && \
     apk --no-cache add \
-        ca-certificates && \
+        ca-certificates \
+        tzdata && \
     apk del build-deps && \
     rm -rf /build
 

diff --git a/docker/local/Dockerfile b/docker/local/Dockerfile
@@ -77,7 +77,8 @@ RUN set -x && \
     install -Dm644 /build/mosq/edl-v10 /usr/share/licenses/mosquitto/edl-v10 && \
     chown -R mosquitto:mosquitto /mosquitto && \
     apk --no-cache add \
-        ca-certificates && \
+        ca-certificates \
+        tzdata && \
     apk del build-deps && \
     rm -rf /build