mirror of
https://github.com/nextcloud/all-in-one.git
synced 2026-02-10 07:47:59 +00:00
Merge pull request #4857 from nextcloud/alpine-3.20.1
update alpine to v3.20.1
This commit is contained in:
commit
0158279eca
52 changed files with 15 additions and 16 deletions
|
|
@ -1,7 +1,7 @@
|
|||
# syntax=docker/dockerfile:latest
|
||||
FROM caddy:2.8.4-alpine as caddy
|
||||
|
||||
FROM httpd:2.4.59-alpine3.19
|
||||
FROM httpd:2.4.59-alpine3.20
|
||||
|
||||
COPY --from=caddy /usr/bin/caddy /usr/bin/caddy
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# syntax=docker/dockerfile:latest
|
||||
FROM alpine:3.19.1
|
||||
FROM alpine:3.20.1
|
||||
|
||||
RUN set -ex; \
|
||||
\
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# syntax=docker/dockerfile:latest
|
||||
FROM haproxy:2.9.7-alpine3.19
|
||||
FROM haproxy:2.9.7-alpine3.20
|
||||
|
||||
# hadolint ignore=DL3002
|
||||
USER root
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# syntax=docker/dockerfile:latest
|
||||
FROM alpine:3.19.1
|
||||
FROM alpine:3.20.1
|
||||
RUN set -ex; \
|
||||
apk upgrade --no-cache -a; \
|
||||
apk add --no-cache bash lighttpd netcat-openbsd; \
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ FROM docker:26.1.4-cli as docker
|
|||
# Caddy is a requirement
|
||||
FROM caddy:2.8.4-alpine as caddy
|
||||
|
||||
# From https://github.com/docker-library/php/blob/master/8.3/alpine3.19/fpm/Dockerfile
|
||||
FROM php:8.3.8-fpm-alpine3.19
|
||||
# From https://github.com/docker-library/php/blob/master/8.3/alpine3.20/fpm/Dockerfile
|
||||
FROM php:8.3.8-fpm-alpine3.20
|
||||
|
||||
EXPOSE 80
|
||||
EXPOSE 8080
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# syntax=docker/dockerfile:latest
|
||||
FROM php:8.2.20-fpm-alpine3.19
|
||||
FROM php:8.2.20-fpm-alpine3.20
|
||||
|
||||
ENV PHP_MEMORY_LIMIT 512M
|
||||
ENV PHP_UPLOAD_LIMIT 10G
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# syntax=docker/dockerfile:latest
|
||||
FROM alpine:3.19.1
|
||||
FROM alpine:3.20.1
|
||||
|
||||
COPY --chmod=775 start.sh /start.sh
|
||||
COPY --chmod=775 healthcheck.sh /healthcheck.sh
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# syntax=docker/dockerfile:latest
|
||||
FROM python:3.12.4-alpine3.19
|
||||
FROM python:3.12.4-alpine3.20
|
||||
|
||||
COPY --chmod=775 start.sh /start.sh
|
||||
|
||||
|
|
@ -26,9 +26,8 @@ RUN set -ex; \
|
|||
pulseaudio \
|
||||
openssl \
|
||||
build-base \
|
||||
linux-headers; \
|
||||
# chromium chromium-chromedriver?
|
||||
apk add --no-cache geckodriver --repository http://dl-cdn.alpinelinux.org/alpine/edge/community; \
|
||||
linux-headers \
|
||||
geckodriver; \
|
||||
useradd -d /tmp --system recording; \
|
||||
# Give root a random password
|
||||
echo "root:$(openssl rand -base64 12)" | chpasswd; \
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
FROM nats:2.10.16-scratch as nats
|
||||
FROM eturnal/eturnal:1.12.0 AS eturnal
|
||||
FROM strukturag/nextcloud-spreed-signaling:1.3.1 as signaling
|
||||
FROM alpine:3.19.1 as janus
|
||||
FROM alpine:3.20.1 as janus
|
||||
|
||||
ARG JANUS_VERSION=v0.14.2
|
||||
WORKDIR /src
|
||||
|
|
@ -34,7 +34,7 @@ RUN set -ex; \
|
|||
make configs; \
|
||||
rename -v ".jcfg.sample" ".jcfg" /usr/local/etc/janus/*.jcfg.sample
|
||||
|
||||
FROM alpine:3.19.1
|
||||
FROM alpine:3.20.1
|
||||
ENV ETURNAL_ETC_DIR="/conf"
|
||||
COPY --from=janus --chmod=777 --chown=1000:1000 /usr/local /usr/local
|
||||
COPY --from=eturnal --chmod=777 --chown=1000:1000 /opt/eturnal /opt/eturnal
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
# From https://github.com/containrrr/watchtower/blob/main/dockerfiles/Dockerfile.self-contained
|
||||
FROM containrrr/watchtower:1.7.1 as watchtower
|
||||
|
||||
FROM alpine:3.19.1
|
||||
FROM alpine:3.20.1
|
||||
|
||||
RUN apk upgrade --no-cache -a; \
|
||||
apk add --no-cache bash
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue