From a5668ff7da2c902050428765edf1db5563baf139 Mon Sep 17 00:00:00 2001
From: Peter Szabo <6030999+gitlab@gmail.com>
Date: Fri, 23 Jun 2023 13:55:25 +0000
Subject: [PATCH 1/2] apt-get install tzdata in Dockerfile

---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index c7eddc3b..e8bdb102 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -25,6 +25,7 @@ RUN apt-get update \
         openjdk-8-jre-headless \
         openjdk-11-jre-headless \
         openjdk-17-jre-headless \
+        tzdata \
     && apt-get autoremove \
     && apt-get clean
 

From 01a4f2ea74ae41aff7b8fcf467985f79c724bd2e Mon Sep 17 00:00:00 2001
From: Iain Powrie <zedifus@zediverse.gg>
Date: Sat, 24 Jun 2023 15:39:38 +0000
Subject: [PATCH 2/2] Update changelog !604

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d6b3f4a3..2c1b814a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@
 ### New features
 TBD
 ### Bug fixes
-TBD
+- Include tzdata in Docker image ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/604))
 ### Tweaks
 TBD
 ### Lang