From c93dbf7624402c66f71d9162979df5174cdcd099 Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Tue, 9 Aug 2022 13:21:39 +0200 Subject: [PATCH 1/2] chore: add tzdata to alpine docker image --- deploy/docker/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/deploy/docker/Dockerfile b/deploy/docker/Dockerfile index 346d33630..40d03f86a 100644 --- a/deploy/docker/Dockerfile +++ b/deploy/docker/Dockerfile @@ -16,6 +16,7 @@ RUN apk add --no-cache \ libc-dev \ libstdc++ \ bash \ + tzdata \ jq COPY . /emqx @@ -48,7 +49,7 @@ COPY deploy/docker/docker-entrypoint.sh /usr/bin/ COPY --from=builder /emqx/_build/$EMQX_NAME/rel/emqx /opt/emqx RUN ln -s /opt/emqx/bin/* /usr/local/bin/ -RUN apk add --no-cache curl ncurses-libs openssl sudo libstdc++ bash +RUN apk add --no-cache curl ncurses-libs openssl sudo libstdc++ bash tzdata WORKDIR /opt/emqx From 20d6a53fa188d55fb52b3bc333c10420d5f24652 Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Tue, 9 Aug 2022 13:23:22 +0200 Subject: [PATCH 2/2] chore: add changelog for tzdata addition in alpine image --- CHANGES-4.3.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES-4.3.md b/CHANGES-4.3.md index 5f387222d..8e982cfa6 100644 --- a/CHANGES-4.3.md +++ b/CHANGES-4.3.md @@ -20,6 +20,7 @@ File format: ### Enhancements - Improve error message for LwM2M plugin when object ID is not valid [#8654](https://github.com/emqx/emqx/pull/8654). +- Add tzdata apk package to alpine docker image. [#8671](https://github.com/emqx/emqx/pull/8671) ## v4.3.18