From: Pablo Zmdl <redacted>
Date: Wed, 20 Nov 2024 14:40:46 +0000 (+0100)
Subject: Update packages in images
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=7592a0599b2700b39ae1929fa2c864c686dee619;p=roundcube-roundcubemail-docker.git

Update packages in images

This should be done by the upstream images, but currently they don't.

And rather than getting into problems due to outdated packages, we take
matters in our own hands.
---

diff --git a/apache/Dockerfile b/apache/Dockerfile
index e6bff6c..1c0d734 100644
--- a/apache/Dockerfile
+++ b/apache/Dockerfile
@@ -2,6 +2,11 @@ FROM php:8.1-apache
 LABEL maintainer="Thomas Bruederli <thomas@roundcube.net>"
 LABEL org.opencontainers.image.source="https://github.com/roundcube/roundcubemail-docker"
 
+# This should be done by the upstream images, but as long as they don't do it,
+# we rather use our own hands than suffer from outdated packages.
+# Kept as standalone command to make it stand out and be easy to remove.
+RUN apt-get update && apt-get upgrade && apt-get clean
+
 RUN set -ex; \
 	if [ "apache" = "apache" ]; then a2enmod rewrite; fi; \
 	apt-get update; \
diff --git a/fpm-alpine/Dockerfile b/fpm-alpine/Dockerfile
index e53feb6..8075fed 100644
--- a/fpm-alpine/Dockerfile
+++ b/fpm-alpine/Dockerfile
@@ -2,6 +2,11 @@ FROM php:8.1-fpm-alpine
 LABEL maintainer="Thomas Bruederli <thomas@roundcube.net>"
 LABEL org.opencontainers.image.source="https://github.com/roundcube/roundcubemail-docker"
 
+# This should be done by the upstream images, but as long as they don't do it,
+# we rather use our own hands than suffer from outdated packages.
+# Kept as standalone command to make it stand out and be easy to remove.
+RUN apk upgrade --no-cache
+
 RUN set -ex; \
 	if [ "fpm-alpine" = "apache" ]; then a2enmod rewrite; fi; \
 	\
diff --git a/fpm/Dockerfile b/fpm/Dockerfile
index 55381ce..00ef925 100644
--- a/fpm/Dockerfile
+++ b/fpm/Dockerfile
@@ -2,6 +2,11 @@ FROM php:8.1-fpm
 LABEL maintainer="Thomas Bruederli <thomas@roundcube.net>"
 LABEL org.opencontainers.image.source="https://github.com/roundcube/roundcubemail-docker"
 
+# This should be done by the upstream images, but as long as they don't do it,
+# we rather use our own hands than suffer from outdated packages.
+# Kept as standalone command to make it stand out and be easy to remove.
+RUN apt-get update && apt-get upgrade && apt-get clean
+
 RUN set -ex; \
 	if [ "fpm" = "apache" ]; then a2enmod rewrite; fi; \
 	apt-get update; \
diff --git a/templates/Dockerfile-alpine.templ b/templates/Dockerfile-alpine.templ
index bb207d1..58bfc02 100644
--- a/templates/Dockerfile-alpine.templ
+++ b/templates/Dockerfile-alpine.templ
@@ -2,6 +2,11 @@ FROM php:8.1-%%VARIANT%%
 LABEL maintainer="Thomas Bruederli <thomas@roundcube.net>"
 LABEL org.opencontainers.image.source="https://github.com/roundcube/roundcubemail-docker"
 
+# This should be done by the upstream images, but as long as they don't do it,
+# we rather use our own hands than suffer from outdated packages.
+# Kept as standalone command to make it stand out and be easy to remove.
+RUN apk upgrade --no-cache
+
 RUN set -ex; \
 	if [ "%%VARIANT%%" = "apache" ]; then a2enmod rewrite; fi; \
 	\
diff --git a/templates/Dockerfile-debian.templ b/templates/Dockerfile-debian.templ
index 62c3eba..ca393ba 100644
--- a/templates/Dockerfile-debian.templ
+++ b/templates/Dockerfile-debian.templ
@@ -2,6 +2,11 @@ FROM php:8.1-%%VARIANT%%
 LABEL maintainer="Thomas Bruederli <thomas@roundcube.net>"
 LABEL org.opencontainers.image.source="https://github.com/roundcube/roundcubemail-docker"
 
+# This should be done by the upstream images, but as long as they don't do it,
+# we rather use our own hands than suffer from outdated packages.
+# Kept as standalone command to make it stand out and be easy to remove.
+RUN apt-get update && apt-get upgrade && apt-get clean
+
 RUN set -ex; \
 	if [ "%%VARIANT%%" = "apache" ]; then a2enmod rewrite; fi; \
 	apt-get update; \