Merge pull request #2768 from nextcloud/alpine-3.18

update all container to alpine v3.18.3
This commit is contained in:
Simon L 2023-06-15 15:11:45 +02:00 committed by GitHub
commit 607a07d2e2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 21 additions and 19 deletions

View file

@ -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

View file

@ -1,4 +1,4 @@
FROM alpine:3.17.3
FROM alpine:3.18.2
RUN set -ex; \
\

View file

@ -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; \

View file

@ -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 \

View file

@ -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

View file

@ -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

View file

@ -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; \

View file

@ -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

View file

@ -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.