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