Merge branch 'hotfix/1.6.3'

civictheme · Jan 3, 2024 · 2d38d5e · 2d38d5e
2 parents 974b4bf + a365054
commit 2d38d5e
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/.docker/cli.dockerfile b/.docker/cli.dockerfile
@@ -44,7 +44,7 @@ ENV WEBROOT=${WEBROOT} \
 
 # Adding more tools.
 RUN apk update \
-    && apk add pv python3 make gcc g++ diffutils ncurses=6.4_p20230506-r0 pv=1.6.20-r1 tzdata=2023c-r1 \
+    && apk add pv python3 make gcc g++ diffutils ncurses=6.4_p20230506-r0 pv=1.6.20-r1 tzdata=2023d-r0 \
     && ln -sf python3 /usr/bin/python \
     && rm -rf /var/cache/apk/*
 

diff --git a/.docker/cli.onlytheme.dockerfile b/.docker/cli.onlytheme.dockerfile
@@ -42,7 +42,7 @@ ENV WEBROOT=${WEBROOT} \
 
 # Adding more tools.
 RUN apk update \
-    && apk add pv python3 make gcc g++ diffutils ncurses=6.4_p20230506-r0 pv=1.6.20-r1 tzdata=2023c-r1 \
+    && apk add pv python3 make gcc g++ diffutils ncurses=6.4_p20230506-r0 pv=1.6.20-r1 tzdata=2023d-r0 \
     && ln -sf python3 /usr/bin/python \
     && rm -rf /var/cache/apk/*
 

diff --git a/.docker/cli.sibling.dockerfile b/.docker/cli.sibling.dockerfile
@@ -44,7 +44,7 @@ ENV WEBROOT=${WEBROOT} \
 
 # Adding more tools.
 RUN apk update \
-    && apk add pv python3 make gcc g++ diffutils ncurses=6.4_p20230506-r0 pv=1.6.20-r1 tzdata=2023c-r1 \
+    && apk add pv python3 make gcc g++ diffutils ncurses=6.4_p20230506-r0 pv=1.6.20-r1 tzdata=2023d-r0 \
     && ln -sf python3 /usr/bin/python \
     && rm -rf /var/cache/apk/*
 

diff --git a/.docker/nginx-drupal.dockerfile b/.docker/nginx-drupal.dockerfile
@@ -13,6 +13,6 @@ FROM uselagoon/nginx-drupal:23.12.0
 ARG WEBROOT=web
 ENV WEBROOT=${WEBROOT}
 
-RUN apk add --no-cache tzdata=2023c-r1
+RUN apk add --no-cache tzdata=2023d-r0
 
 COPY --from=cli /app /app
diff --git a/.docker/php.dockerfile b/.docker/php.dockerfile
@@ -10,6 +10,6 @@ FROM ${CLI_IMAGE:-cli} as cli
 # @see https://github.com/uselagoon/lagoon-images/tree/main/images/php-fpm
 FROM uselagoon/php-8.1-fpm:23.12.0
 
-RUN apk add --no-cache tzdata=2023c-r1
+RUN apk add --no-cache tzdata=2023d-r0
 
 COPY --from=cli /app /app