From 3029b277f1ad08a9f9f03c618aa3e3580137c3a4 Mon Sep 17 00:00:00 2001 From: szaimen Date: Fri, 11 Feb 2022 15:47:49 +0100 Subject: [PATCH] use dependabot to update containers Signed-off-by: szaimen --- .github/dependabot.yml | 15 +++++++++++---- Containers/apache/Dockerfile | 2 +- Containers/borgbackup/Dockerfile | 2 +- Containers/collabora/Dockerfile | 2 +- Containers/domaincheck/Dockerfile | 2 +- Containers/mastercontainer/Dockerfile | 7 +++++-- Containers/nextcloud/Dockerfile | 2 +- Containers/postgresql/Dockerfile | 2 +- Containers/redis/Dockerfile | 2 +- Containers/talk/Dockerfile | 2 +- Containers/watchtower/Dockerfile | 4 ++-- 11 files changed, 26 insertions(+), 16 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 4a55698f..4f8ed504 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -3,10 +3,17 @@ updates: - package-ecosystem: composer directory: "/php/" schedule: - interval: weekly - day: saturday - time: "03:00" - timezone: Europe/Paris + interval: daily + time: "12:00" + open-pull-requests-limit: 10 + labels: + - 3. to review + - dependencies +- package-ecosystem: "docker" + directory: "/Containers/" + schedule: + interval: "daily" + time: "12:00" open-pull-requests-limit: 10 labels: - 3. to review diff --git a/Containers/apache/Dockerfile b/Containers/apache/Dockerfile index 3debc6a1..d33f236b 100644 --- a/Containers/apache/Dockerfile +++ b/Containers/apache/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:bullseye-slim +FROM debian:bullseye-20220125-slim EXPOSE 80 diff --git a/Containers/borgbackup/Dockerfile b/Containers/borgbackup/Dockerfile index 4f547164..e52fbf12 100644 --- a/Containers/borgbackup/Dockerfile +++ b/Containers/borgbackup/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:bullseye-slim +FROM debian:bullseye-20220125-slim RUN set -ex; \ \ diff --git a/Containers/collabora/Dockerfile b/Containers/collabora/Dockerfile index 299f6080..131d6604 100644 --- a/Containers/collabora/Dockerfile +++ b/Containers/collabora/Dockerfile @@ -1,2 +1,2 @@ # From a file located probably somewhere here: https://github.com/CollaboraOnline/online/tree/master/docker -FROM collabora/code:latest \ No newline at end of file +FROM collabora/code:21.11.1.4.1 \ No newline at end of file diff --git a/Containers/domaincheck/Dockerfile b/Containers/domaincheck/Dockerfile index f6cd8d60..86aef200 100644 --- a/Containers/domaincheck/Dockerfile +++ b/Containers/domaincheck/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine +FROM alpine:3.15.0 RUN apk add --update --no-cache lighttpd bash RUN adduser -S www-data -G www-data diff --git a/Containers/mastercontainer/Dockerfile b/Containers/mastercontainer/Dockerfile index c25d0021..923aa943 100644 --- a/Containers/mastercontainer/Dockerfile +++ b/Containers/mastercontainer/Dockerfile @@ -1,5 +1,8 @@ +# Docker CLI is a requirement +FROM docker:20.10.12-dind-alpine3.15 as dind + # From https://github.com/docker-library/php/blob/master/8.0/bullseye/apache/Dockerfile -FROM php:8.0-apache-bullseye +FROM php:8.0.15-apache-bullseye EXPOSE 80 EXPOSE 8080 @@ -28,7 +31,7 @@ RUN set -ex; \ && chmod +x /usr/bin/caddy \ && /usr/bin/caddy version -COPY --from=docker:dind /usr/local/bin/docker /usr/local/bin/ +COPY --from=dind /usr/local/bin/docker /usr/local/bin/ RUN chmod +x /usr/local/bin/docker RUN mkdir -p /usr/src/php/ext/apcu && \ diff --git a/Containers/nextcloud/Dockerfile b/Containers/nextcloud/Dockerfile index bb05eb27..09e32a4f 100644 --- a/Containers/nextcloud/Dockerfile +++ b/Containers/nextcloud/Dockerfile @@ -1,5 +1,5 @@ # From https://github.com/nextcloud/docker/blob/master/23/fpm-alpine/Dockerfile -FROM php:8.0-fpm-alpine +FROM php:8.0.15-fpm-alpine3.15 # Custom: change id of www-data user as it needs to be the same like on old installations RUN set -ex; \ diff --git a/Containers/postgresql/Dockerfile b/Containers/postgresql/Dockerfile index a41f4ed4..cc97ddaa 100644 --- a/Containers/postgresql/Dockerfile +++ b/Containers/postgresql/Dockerfile @@ -1,5 +1,5 @@ # From https://github.com/docker-library/postgres/blob/master/13/alpine/Dockerfile -FROM postgres:13-alpine +FROM postgres:13.5-alpine3.15 RUN apk add --update --no-cache bash openssl shadow diff --git a/Containers/redis/Dockerfile b/Containers/redis/Dockerfile index b8c59529..523d50f2 100644 --- a/Containers/redis/Dockerfile +++ b/Containers/redis/Dockerfile @@ -1,5 +1,5 @@ # From https://github.com/docker-library/redis/blob/master/6.2/alpine/Dockerfile -FROM redis:6.2-alpine +FROM 6.2.6-alpine3.15 RUN apk add --update --no-cache openssl bash diff --git a/Containers/talk/Dockerfile b/Containers/talk/Dockerfile index de23972c..523666aa 100644 --- a/Containers/talk/Dockerfile +++ b/Containers/talk/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:focal +FROM ubuntu:focal-20220113 EXPOSE 3478 diff --git a/Containers/watchtower/Dockerfile b/Containers/watchtower/Dockerfile index 60af8195..aa6331fe 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:latest as watchtower +FROM containrrr/watchtower:1.4.0 as watchtower -FROM alpine:latest +FROM alpine:3.15.0 RUN apk add --update --no-cache bash COPY --from=watchtower /watchtower /