Merge branch 'master' of https://github.com/netdisco/netdisco-docker

* 'master' of https://github.com/netdisco/netdisco-docker: add tzdata to netdisco-postgresql add tzdata to netdisco-base
netdisco · Apr 9, 2024 · 3f317a8 · 3f317a8
2 parents 8c2626a + d7a9406
commit 3f317a8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/netdisco-base/Dockerfile b/netdisco-base/Dockerfile
@@ -72,6 +72,7 @@ RUN apk add --no-cache \
       perl-regexp-ipv6 \
       perl-file-sharedir \
       postgresql-client \
+      tzdata \
       shadow
 
 RUN groupadd -r netdisco -g 901 && \

diff --git a/netdisco-postgresql/Dockerfile b/netdisco-postgresql/Dockerfile
@@ -19,6 +19,7 @@ LABEL org.label-schema.docker.schema-version="1.0" \
 
 RUN apk add --no-cache \
   curl \
+  tzdata \
   tar
 
 COPY netdisco-initdb.sh /docker-entrypoint-initdb.d/
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,6 +19,7 @@ LABEL org.label-schema.docker.schema-version="1.0" \ @@
     RUN apk add --no-cache \
       curl \
+      tzdata \
       tar
     COPY netdisco-initdb.sh /docker-entrypoint-initdb.d/
@@ Expand Down @@