From 75b2bd3c756cdd97aef3fcdff494994cef5c47c1 Mon Sep 17 00:00:00 2001 From: Simon L Date: Mon, 29 Jan 2024 16:48:55 +0100 Subject: [PATCH] update all remaining images to alpine3.19 Signed-off-by: Simon L --- Containers/apache/Dockerfile | 2 +- Containers/docker-socket-proxy/Dockerfile | 2 +- Containers/imaginary/Dockerfile | 4 ++-- Containers/mastercontainer/Dockerfile | 4 ++-- Containers/nextcloud/Dockerfile | 2 +- Containers/talk-recording/Dockerfile | 2 +- readme.md | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Containers/apache/Dockerfile b/Containers/apache/Dockerfile index 828cbcaf..b30b65f4 100644 --- a/Containers/apache/Dockerfile +++ b/Containers/apache/Dockerfile @@ -1,6 +1,6 @@ FROM caddy:2.7.6-alpine as caddy -FROM httpd:2.4.58-alpine3.18 +FROM httpd:2.4.58-alpine3.19 COPY --from=caddy /usr/bin/caddy /usr/bin/caddy diff --git a/Containers/docker-socket-proxy/Dockerfile b/Containers/docker-socket-proxy/Dockerfile index 3831d548..ec30c35d 100644 --- a/Containers/docker-socket-proxy/Dockerfile +++ b/Containers/docker-socket-proxy/Dockerfile @@ -1,4 +1,4 @@ -FROM haproxy:2.9.0-alpine3.18 +FROM haproxy:2.9.0-alpine3.19 # hadolint ignore=DL3002 USER root diff --git a/Containers/imaginary/Dockerfile b/Containers/imaginary/Dockerfile index 0018739c..78a10c1e 100644 --- a/Containers/imaginary/Dockerfile +++ b/Containers/imaginary/Dockerfile @@ -1,6 +1,6 @@ -FROM golang:1.21.6-alpine3.18 as go +FROM golang:1.21.6-alpine3.19 as go -ENV IMAGINARY_HASH 6cd9edd1d3fb151eb773c14552886e4fc8e50138 +ENV IMAGINARY_HASH 6cd9edd1d3fb151eb773c14552886e4fc8e50138 RUN set -ex; \ apk add --no-cache \ diff --git a/Containers/mastercontainer/Dockerfile b/Containers/mastercontainer/Dockerfile index 38dc498d..f6915300 100644 --- a/Containers/mastercontainer/Dockerfile +++ b/Containers/mastercontainer/Dockerfile @@ -4,8 +4,8 @@ FROM docker:24.0.7-cli as docker # Caddy is a requirement FROM caddy:2.7.6-alpine as caddy -# From https://github.com/docker-library/php/blob/master/8.2/alpine3.18/fpm/Dockerfile -FROM php:8.2.15-fpm-alpine3.18 +# From https://github.com/docker-library/php/blob/master/8.2/alpine3.19/fpm/Dockerfile +FROM php:8.2.15-fpm-alpine3.19 EXPOSE 80 EXPOSE 8080 diff --git a/Containers/nextcloud/Dockerfile b/Containers/nextcloud/Dockerfile index f0c32667..c6a24ebc 100644 --- a/Containers/nextcloud/Dockerfile +++ b/Containers/nextcloud/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.1.27-fpm-alpine3.18 +FROM php:8.1.27-fpm-alpine3.19 ENV PHP_MEMORY_LIMIT 512M ENV PHP_UPLOAD_LIMIT 10G diff --git a/Containers/talk-recording/Dockerfile b/Containers/talk-recording/Dockerfile index 4c5dffe2..c8db1403 100644 --- a/Containers/talk-recording/Dockerfile +++ b/Containers/talk-recording/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.12.1-alpine3.18 +FROM python:3.12.1-alpine3.19 COPY --chmod=775 start.sh /start.sh diff --git a/readme.md b/readme.md index 00eae3c4..081278a1 100644 --- a/readme.md +++ b/readme.md @@ -658,7 +658,7 @@ You might want to adjust the Nextcloud apps that are installed upon the first st ### How to add OS packages permanently to the Nextcloud container? Some Nextcloud apps require additional external dependencies that must be bundled within Nextcloud container in order to work correctly. As we cannot put each and every dependency for all apps into the container - as this would make the project quickly unmaintainable - there is an official way in which you can add additional dependencies into the Nextcloud container. However note that doing this is disrecommended since we do not test Nextcloud apps that require external dependencies. -You can do so by adding `--env NEXTCLOUD_ADDITIONAL_APKS="imagemagick dependency2 dependency3"` to the docker run command of the mastercontainer (but before the last line `nextcloud/all-in-one:latest`! If it was started already, you will need to stop the mastercontainer, remove it (no data will be lost) and recreate it using the docker run command that you initially used) and customize the value to your fitting. It must be a string with small letters a-z, digits 0-9, spaces, dots and hyphens or '_'. You can find available packages here: https://pkgs.alpinelinux.org/packages?branch=v3.18. By default `imagemagick` is added. If you want to keep it, you need to specify it as well. +You can do so by adding `--env NEXTCLOUD_ADDITIONAL_APKS="imagemagick dependency2 dependency3"` to the docker run command of the mastercontainer (but before the last line `nextcloud/all-in-one:latest`! If it was started already, you will need to stop the mastercontainer, remove it (no data will be lost) and recreate it using the docker run command that you initially used) and customize the value to your fitting. It must be a string with small letters a-z, digits 0-9, spaces, dots and hyphens or '_'. You can find available packages here: https://pkgs.alpinelinux.org/packages?branch=v3.19. By default `imagemagick` is added. If you want to keep it, you need to specify it as well. ### How to add PHP extensions permanently to the Nextcloud container? Some Nextcloud apps require additional php extensions that must be bundled within Nextcloud container in order to work correctly. As we cannot put each and every dependency for all apps into the container - as this would make the project quickly unmaintainable - there is an official way in which you can add additional php extensions into the Nextcloud container. However note that doing this is disrecommended since we do not test Nextcloud apps that require additional php extensions.