Merge branch 'main' into main

This commit is contained in:
Jehu Marcos Herrera Puentes 2024-12-16 11:15:18 -06:00 committed by GitHub
commit c5da6e718f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
49 changed files with 392 additions and 143 deletions

View file

@ -2,7 +2,7 @@
FROM caddy:2.8.4-alpine AS caddy
# From https://github.com/docker-library/httpd/blob/master/2.4/alpine/Dockerfile
FROM httpd:2.4.62-alpine3.20
FROM httpd:2.4.62-alpine3.21
COPY --from=caddy /usr/bin/caddy /usr/bin/caddy

View file

@ -1,5 +1,5 @@
# syntax=docker/dockerfile:latest
FROM alpine:3.20.3
FROM alpine:3.21.0
RUN set -ex; \
\

View file

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:latest
# Probably from this file: https://github.com/Cisco-Talos/clamav-docker/blob/main/clamav/1.3/alpine/Dockerfile
FROM clamav/clamav:1.4.1-16
FROM clamav/clamav:1.4.1-17
COPY clamav.conf /clamav.conf
COPY --chmod=775 start.script /start.script
@ -23,4 +23,6 @@ USER 100
LABEL com.centurylinklabs.watchtower.enable="false"
HEALTHCHECK --start-period=60s --retries=9 CMD clamdcheck.sh
ENTRYPOINT ["/init-unprivileged"]

View file

@ -20,5 +20,5 @@ COPY --chmod=775 healthcheck.sh /healthcheck.sh
USER 100
HEALTHCHECK --start-period=360s CMD /healthcheck.sh
HEALTHCHECK --start-period=60s --retries=9 CMD /healthcheck.sh
LABEL com.centurylinklabs.watchtower.enable="false"

View file

@ -1,5 +1,5 @@
# syntax=docker/dockerfile:latest
FROM haproxy:3.1.0-alpine
FROM haproxy:3.1.1-alpine
# hadolint ignore=DL3002
USER root

View file

@ -1,5 +1,5 @@
# syntax=docker/dockerfile:latest
FROM alpine:3.20.3
FROM alpine:3.21.0
RUN set -ex; \
apk upgrade --no-cache -a; \
apk add --no-cache bash lighttpd netcat-openbsd; \

View file

@ -1,5 +1,5 @@
# syntax=docker/dockerfile:latest
FROM golang:1.23.4-alpine3.20 AS go
FROM golang:1.23.4-alpine3.21 AS go
ENV IMAGINARY_HASH=8f36a26c448be8c151a3878404b75fcd1cd3cf0c
@ -13,7 +13,7 @@ RUN set -ex; \
build-base; \
go install github.com/h2non/imaginary@"$IMAGINARY_HASH";
FROM alpine:3.20.3
FROM alpine:3.21.0
RUN set -ex; \
apk upgrade --no-cache -a; \
apk add --no-cache \

View file

@ -1,12 +1,12 @@
# syntax=docker/dockerfile:latest
# Docker CLI is a requirement
FROM docker:27.3.1-cli AS docker
FROM docker:27.4.0-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.20/fpm/Dockerfile
FROM php:8.3.14-fpm-alpine3.20
# From https://github.com/docker-library/php/blob/master/8.3/alpine3.21/fpm/Dockerfile
FROM php:8.3.14-fpm-alpine3.21
EXPOSE 80
EXPOSE 8080

View file

@ -1,5 +1,5 @@
# syntax=docker/dockerfile:latest
FROM php:8.3.14-fpm-alpine3.20
FROM php:8.3.14-fpm-alpine3.21
ENV PHP_MEMORY_LIMIT=512M
ENV PHP_UPLOAD_LIMIT=16G
@ -8,7 +8,7 @@ ENV SOURCE_LOCATION=/usr/src/nextcloud
ENV REDIS_DB_INDEX=0
# AIO settings start # Do not remove or change this line!
ENV NEXTCLOUD_VERSION=30.0.2
ENV NEXTCLOUD_VERSION=30.0.4
ENV AIO_TOKEN=123456
ENV AIO_URL=localhost
# AIO settings end # Do not remove or change this line!

View file

@ -1,5 +1,5 @@
# syntax=docker/dockerfile:latest
FROM alpine:3.20.3
FROM alpine:3.21.0
COPY --chmod=775 start.sh /start.sh
COPY --chmod=775 healthcheck.sh /healthcheck.sh

View file

@ -6,5 +6,5 @@ FROM onlyoffice/documentserver:8.2.2.1
COPY --chmod=775 healthcheck.sh /healthcheck.sh
HEALTHCHECK --start-period=360s CMD /healthcheck.sh
HEALTHCHECK --start-period=60s --retries=9 CMD /healthcheck.sh
LABEL com.centurylinklabs.watchtower.enable="false"

View file

@ -1,5 +1,5 @@
# syntax=docker/dockerfile:latest
# From https://github.com/docker-library/postgres/blob/master/16/alpine3.20/Dockerfile
# From https://github.com/docker-library/postgres/blob/master/16/alpine3.21/Dockerfile
FROM postgres:16.6-alpine
COPY --chmod=775 start.sh /start.sh

View file

@ -1,5 +1,5 @@
# syntax=docker/dockerfile:latest
FROM python:3.13.1-alpine3.20
FROM python:3.13.1-alpine3.21
COPY --chmod=775 start.sh /start.sh
COPY --chmod=775 healthcheck.sh /healthcheck.sh

View file

@ -1,10 +1,10 @@
# syntax=docker/dockerfile:latest
FROM nats:2.10.22-scratch AS nats
FROM nats:2.10.23-scratch AS nats
FROM eturnal/eturnal:1.12.1 AS eturnal
FROM strukturag/nextcloud-spreed-signaling:2.0.1 AS signaling
FROM alpine:3.20.3 AS janus
FROM alpine:3.21.0 AS janus
ARG JANUS_VERSION=v0.15.0
ARG JANUS_VERSION=v1.3.0
WORKDIR /src
RUN set -ex; \
apk add --no-cache \
@ -34,7 +34,7 @@ RUN set -ex; \
make configs; \
rename -v ".jcfg.sample" ".jcfg" /usr/local/etc/janus/*.jcfg.sample
FROM alpine:3.20.3
FROM alpine:3.21.0
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

View file

@ -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.20.3
FROM alpine:3.21.0
RUN set -ex; \
apk upgrade --no-cache -a; \