diff --git a/Containers/apache/Dockerfile b/Containers/apache/Dockerfile index 8b6ce492..fc8a391f 100644 --- a/Containers/apache/Dockerfile +++ b/Containers/apache/Dockerfile @@ -1,6 +1,6 @@ FROM caddy:2.6.4-alpine as caddy -FROM httpd:2.4.57-alpine3.17 +FROM httpd:2.4.57-alpine3.18 COPY --from=caddy /usr/bin/caddy /usr/bin/caddy diff --git a/Containers/borgbackup/Dockerfile b/Containers/borgbackup/Dockerfile index cf48f52c..8e3a65a0 100644 --- a/Containers/borgbackup/Dockerfile +++ b/Containers/borgbackup/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.17.3 +FROM alpine:3.18.2 RUN set -ex; \ \ diff --git a/Containers/domaincheck/Dockerfile b/Containers/domaincheck/Dockerfile index fc7264ef..4c4e33e8 100644 --- a/Containers/domaincheck/Dockerfile +++ b/Containers/domaincheck/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.17.3 +FROM alpine:3.18.2 RUN set -ex; \ apk add --no-cache bash lighttpd netcat-openbsd; \ adduser -S www-data -G www-data; \ diff --git a/Containers/imaginary/Dockerfile b/Containers/imaginary/Dockerfile index 514de406..b88adcaf 100644 --- a/Containers/imaginary/Dockerfile +++ b/Containers/imaginary/Dockerfile @@ -1,6 +1,6 @@ -FROM golang:1.20.5-alpine3.17 as go +FROM golang:1.20.5-alpine3.18 as go -ENV IMAGINARY_HASH b632dae8cc321452c3f85bcae79c580b1ae1ed84 +ENV IMAGINARY_HASH b632dae8cc321452c3f85bcae79c580b1ae1ed84 RUN set -ex; \ apk add --no-cache \ @@ -12,7 +12,7 @@ RUN set -ex; \ build-base; \ go install github.com/h2non/imaginary@"$IMAGINARY_HASH"; -FROM alpine:3.17.3 +FROM alpine:3.18.2 RUN set -ex; \ apk add --no-cache \ tzdata \ diff --git a/Containers/mastercontainer/Dockerfile b/Containers/mastercontainer/Dockerfile index e844f340..43fbc00b 100644 --- a/Containers/mastercontainer/Dockerfile +++ b/Containers/mastercontainer/Dockerfile @@ -4,8 +4,8 @@ FROM docker:24.0.2-cli as docker # Caddy is a requirement FROM caddy:2.6.4-alpine as caddy -# From https://github.com/docker-library/php/blob/master/8.2/alpine3.17/fpm/Dockerfile -FROM php:8.2.7-fpm-alpine3.17 +# From https://github.com/docker-library/php/blob/master/8.2/alpine3.18/fpm/Dockerfile +FROM php:8.2.7-fpm-alpine3.18 EXPOSE 80 EXPOSE 8080 diff --git a/Containers/nextcloud/Dockerfile b/Containers/nextcloud/Dockerfile index 059c0931..49f05cba 100644 --- a/Containers/nextcloud/Dockerfile +++ b/Containers/nextcloud/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.1.20-fpm-alpine3.17 +FROM php:8.1.20-fpm-alpine3.18 ENV PHP_MEMORY_LIMIT 512M ENV PHP_UPLOAD_LIMIT 10G diff --git a/Containers/talk/Dockerfile b/Containers/talk/Dockerfile index 1d5f3899..ca50732f 100644 --- a/Containers/talk/Dockerfile +++ b/Containers/talk/Dockerfile @@ -1,6 +1,6 @@ FROM nats:2.9.17-scratch as nats FROM strukturag/nextcloud-spreed-signaling:1.1.2 as signaling -FROM coturn/coturn:4.6.2-r0-alpine +FROM coturn/coturn:4.6.2-r3-alpine USER root COPY --from=nats /nats-server /usr/local/bin/nats-server @@ -14,26 +14,28 @@ RUN set -ex; \ ca-certificates \ tzdata \ bash \ + janus-gateway \ openssl \ supervisor \ bind-tools \ netcat-openbsd \ + wget \ shadow \ util-linux \ build-base \ - lua5.3-dev \ - luarocks5.3; \ - apk add --no-cache janus-gateway --repository http://dl-cdn.alpinelinux.org/alpine/edge/community; \ + lua5.4-dev \ + luarocks5.4; \ useradd --system talk; \ - luarocks-5.3 install luajson; \ - luarocks-5.3 install ansicolors; \ + luarocks-5.4 install luajson; \ + luarocks-5.4 install ansicolors; \ rename -v ".jcfg.sample" ".jcfg" /etc/janus/*.sample; \ apk del --no-cache \ + wget \ shadow \ util-linux \ build-base \ - lua5.3-dev \ - luarocks5.3; \ + lua5.4-dev \ + luarocks5.4; \ \ # Give root a random password echo "root:$(openssl rand -base64 12)" | chpasswd; \ diff --git a/Containers/watchtower/Dockerfile b/Containers/watchtower/Dockerfile index ec8f30ad..113d8bfc 100644 --- a/Containers/watchtower/Dockerfile +++ b/Containers/watchtower/Dockerfile @@ -1,7 +1,7 @@ # From https://github.com/containrrr/watchtower/blob/main/dockerfiles/Dockerfile.self-contained FROM containrrr/watchtower:1.5.3 as watchtower -FROM alpine:3.17.3 +FROM alpine:3.18.2 RUN apk add --no-cache bash COPY --from=watchtower /watchtower /watchtower diff --git a/readme.md b/readme.md index 89038fec..c2e0d311 100644 --- a/readme.md +++ b/readme.md @@ -620,7 +620,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 very fast unmaintainable - there is an official way how 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.17. By default added is `imagemagick`. If you want to keep that, 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.18. By default added is `imagemagick`. If you want to keep that, 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 very fast unmaintainable - there is an official way how 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.