Skip to content

Commit

Permalink
Merge pull request #281 from roundcube/update-packages-in-images
Browse files Browse the repository at this point in the history
  • Loading branch information
pabzm authored Dec 3, 2024
2 parents 805678f + 7592a05 commit eb7ad58
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 0 deletions.
5 changes: 5 additions & 0 deletions apache/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@ FROM php:8.1-apache
LABEL maintainer="Thomas Bruederli <[email protected]>"
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; \
Expand Down
5 changes: 5 additions & 0 deletions fpm-alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@ FROM php:8.1-fpm-alpine
LABEL maintainer="Thomas Bruederli <[email protected]>"
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; \
\
Expand Down
5 changes: 5 additions & 0 deletions fpm/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@ FROM php:8.1-fpm
LABEL maintainer="Thomas Bruederli <[email protected]>"
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; \
Expand Down
5 changes: 5 additions & 0 deletions templates/Dockerfile-alpine.templ
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@ FROM php:8.1-%%VARIANT%%
LABEL maintainer="Thomas Bruederli <[email protected]>"
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; \
\
Expand Down
5 changes: 5 additions & 0 deletions templates/Dockerfile-debian.templ
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@ FROM php:8.1-%%VARIANT%%
LABEL maintainer="Thomas Bruederli <[email protected]>"
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; \
Expand Down

0 comments on commit eb7ad58

Please sign in to comment.