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 e6bff6ceb5c0f7bd13bed06405d214a1f5dc8047..1c0d7341e2593b21b19c6801bcd514e9a5a8619c 100644 (file)
--- 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 e53feb6151537bf6cc6f632ad163b75e951a1031..8075fed9a20568f4942c3bf7344c0677b87ec765 100644 (file)
--- 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 55381ce3c7287dce4f7c32209ece1c7926aeb9ce..00ef925cebf6fb3cf17af3dbfb505b1aa3e08a5b 100644 (file)
--- 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 bb207d111d16a56b566c1b507841c0eed7f1a1a2..58bfc0271679211c7fae85feac07b1322e222c29 100644 (file)
--- 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 62c3eba3727db954a2be17c82da8477197e22bc8..ca393ba28562d67bd31cd9a22640195acd49b4f5 100644 (file)
--- 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; \