From ea17037275b510a75c7e1dc5b7541c7bea7d703e Mon Sep 17 00:00:00 2001
From: CrazyMax <crazy-max@users.noreply.github.com>
Date: Sun, 22 Nov 2020 18:24:07 +0100
Subject: [PATCH] Fix tzdata issue with Alpine (#143)

---
 CHANGELOG.md | 4 ++++
 Dockerfile   | 4 +---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2168798..6666add 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.69-RC3 (2020/11/22)
+
+* Fix tzdata issue with Alpine (#143)
+
 ## 1.69-RC2 (2020/11/04)
 
 * Do not set default value for `RRDCACHED_SERVER`
diff --git a/Dockerfile b/Dockerfile
index 8a2fea5..7f9aaec 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -65,11 +65,9 @@ RUN apk --update --no-cache add \
     su-exec \
     syslog-ng=3.27.1-r0 \
     ttf-dejavu \
+    tzdata \
     util-linux \
     whois \
-  # FIXME: Remove when tzdata package updated on Alpine stable to 2020d-r0 (https://github.com/librenms/docker/issues/143)
-  && apk --update --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/main add \
-    tzdata \
   && apk --update --no-cache add -t build-dependencies \
     build-base \
     make \