From 38cd37622880ef4c3ee2ca1a25abd740bfbe9e54 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 28 May 2023 15:48:28 +0200 Subject: [PATCH 1/4] Update dependency nextcloud/server to v26.0.2 (#5254) Signed-off-by: milkmaker Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- helper-scripts/nextcloud.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helper-scripts/nextcloud.sh b/helper-scripts/nextcloud.sh index d1d4b837..c12ecede 100755 --- a/helper-scripts/nextcloud.sh +++ b/helper-scripts/nextcloud.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # renovate: datasource=github-releases depName=nextcloud/server versioning=semver extractVersion=^v(?.*)$ -NEXTCLOUD_VERSION=26.0.1 +NEXTCLOUD_VERSION=26.0.2 echo -ne "Checking prerequisites..." sleep 1 From f80940efdccd393bf5fccec2886795372a38c445 Mon Sep 17 00:00:00 2001 From: FreddleSpl0it Date: Tue, 30 May 2023 09:09:41 +0200 Subject: [PATCH 2/4] [Dovecot] remove pass return in Dovecot lua auth --- data/Dockerfiles/dovecot/docker-entrypoint.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/Dockerfiles/dovecot/docker-entrypoint.sh b/data/Dockerfiles/dovecot/docker-entrypoint.sh index 18746deb..05b552e9 100755 --- a/data/Dockerfiles/dovecot/docker-entrypoint.sh +++ b/data/Dockerfiles/dovecot/docker-entrypoint.sh @@ -159,7 +159,7 @@ function auth_password_verify(req, pass) VALUES ("%s", 0, "%s", "%s")]], con:escape(req.service), con:escape(req.user), con:escape(req.real_rip))) cur:close() con:close() - return dovecot.auth.PASSDB_RESULT_OK, "password=" .. pass + return dovecot.auth.PASSDB_RESULT_OK, "password=pass" end row = cur:fetch (row, "a") end @@ -180,13 +180,13 @@ function auth_password_verify(req, pass) if tostring(req.real_rip) == "__IPV4_SOGO__" then cur:close() con:close() - return dovecot.auth.PASSDB_RESULT_OK, "password=" .. pass + return dovecot.auth.PASSDB_RESULT_OK, "password=pass" elseif row.has_prot_access == "1" then con:execute(string.format([[REPLACE INTO sasl_log (service, app_password, username, real_rip) VALUES ("%s", %d, "%s", "%s")]], con:escape(req.service), row.id, con:escape(req.user), con:escape(req.real_rip))) cur:close() con:close() - return dovecot.auth.PASSDB_RESULT_OK, "password=" .. pass + return dovecot.auth.PASSDB_RESULT_OK, "password=pass" end end row = cur:fetch (row, "a") From f82aba3e26a58c018283524098dc373ca6273172 Mon Sep 17 00:00:00 2001 From: DerLinkman Date: Tue, 30 May 2023 16:18:14 +0200 Subject: [PATCH 3/4] [Dovecot] Update to 1.24 --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index f53b54c4..a5a8f95b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -216,7 +216,7 @@ services: - sogo dovecot-mailcow: - image: mailcow/dovecot:1.23 + image: mailcow/dovecot:1.24 depends_on: - mysql-mailcow dns: From 70aab7568e7eea15d5d1777781bdcdfee06dbacd Mon Sep 17 00:00:00 2001 From: DerLinkman Date: Tue, 30 May 2023 16:20:35 +0200 Subject: [PATCH 4/4] Changed maintainers to tinc (Dockerfiles) --- data/Dockerfiles/acme/Dockerfile | 2 +- data/Dockerfiles/dockerapi/Dockerfile | 2 +- data/Dockerfiles/dovecot/Dockerfile | 2 +- data/Dockerfiles/netfilter/Dockerfile | 2 +- data/Dockerfiles/olefy/Dockerfile | 2 +- data/Dockerfiles/phpfpm/Dockerfile | 2 +- data/Dockerfiles/postfix/Dockerfile | 2 +- data/Dockerfiles/rspamd/Dockerfile | 2 +- data/Dockerfiles/sogo/Dockerfile | 2 +- data/Dockerfiles/unbound/Dockerfile | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/data/Dockerfiles/acme/Dockerfile b/data/Dockerfiles/acme/Dockerfile index 571c3d08..898dd8b6 100644 --- a/data/Dockerfiles/acme/Dockerfile +++ b/data/Dockerfiles/acme/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.17 -LABEL maintainer "Andre Peters " +LABEL maintainer "The Infrastructure Company GmbH " RUN apk upgrade --no-cache \ && apk add --update --no-cache \ diff --git a/data/Dockerfiles/dockerapi/Dockerfile b/data/Dockerfiles/dockerapi/Dockerfile index aa4a3858..fce4dde8 100644 --- a/data/Dockerfiles/dockerapi/Dockerfile +++ b/data/Dockerfiles/dockerapi/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.17 -LABEL maintainer "Andre Peters " +LABEL maintainer "The Infrastructure Company GmbH " WORKDIR /app diff --git a/data/Dockerfiles/dovecot/Dockerfile b/data/Dockerfiles/dovecot/Dockerfile index ae7984e3..db3a71b5 100644 --- a/data/Dockerfiles/dovecot/Dockerfile +++ b/data/Dockerfiles/dovecot/Dockerfile @@ -1,5 +1,5 @@ FROM debian:bullseye-slim -LABEL maintainer "Andre Peters " +LABEL maintainer "The Infrastructure Company GmbH " ARG DEBIAN_FRONTEND=noninteractive # renovate: datasource=github-tags depName=dovecot/core versioning=semver-coerced diff --git a/data/Dockerfiles/netfilter/Dockerfile b/data/Dockerfiles/netfilter/Dockerfile index bc707391..4fcb5eef 100644 --- a/data/Dockerfiles/netfilter/Dockerfile +++ b/data/Dockerfiles/netfilter/Dockerfile @@ -1,5 +1,5 @@ FROM alpine:3.17 -LABEL maintainer "Andre Peters " +LABEL maintainer "The Infrastructure Company GmbH " ENV XTABLES_LIBDIR /usr/lib/xtables ENV PYTHON_IPTABLES_XTABLES_VERSION 12 diff --git a/data/Dockerfiles/olefy/Dockerfile b/data/Dockerfiles/olefy/Dockerfile index 10d63d02..06d4679f 100644 --- a/data/Dockerfiles/olefy/Dockerfile +++ b/data/Dockerfiles/olefy/Dockerfile @@ -1,5 +1,5 @@ FROM alpine:3.17 -LABEL maintainer "Andre Peters " +LABEL maintainer "The Infrastructure Company GmbH " WORKDIR /app diff --git a/data/Dockerfiles/phpfpm/Dockerfile b/data/Dockerfiles/phpfpm/Dockerfile index 0ff47206..a7a4236b 100644 --- a/data/Dockerfiles/phpfpm/Dockerfile +++ b/data/Dockerfiles/phpfpm/Dockerfile @@ -1,5 +1,5 @@ FROM php:8.2-fpm-alpine3.17 -LABEL maintainer "Andre Peters " +LABEL maintainer "The Infrastructure Company GmbH " # renovate: datasource=github-tags depName=krakjoe/apcu versioning=semver-coerced ARG APCU_PECL_VERSION=5.1.22 diff --git a/data/Dockerfiles/postfix/Dockerfile b/data/Dockerfiles/postfix/Dockerfile index e3c64987..07ab8949 100644 --- a/data/Dockerfiles/postfix/Dockerfile +++ b/data/Dockerfiles/postfix/Dockerfile @@ -1,5 +1,5 @@ FROM debian:bullseye-slim -LABEL maintainer "Andre Peters " +LABEL maintainer "The Infrastructure Company GmbH " ARG DEBIAN_FRONTEND=noninteractive ENV LC_ALL C diff --git a/data/Dockerfiles/rspamd/Dockerfile b/data/Dockerfiles/rspamd/Dockerfile index 2520ddcc..9d022f82 100644 --- a/data/Dockerfiles/rspamd/Dockerfile +++ b/data/Dockerfiles/rspamd/Dockerfile @@ -1,5 +1,5 @@ FROM debian:bullseye-slim -LABEL maintainer "Andre Peters " +LABEL maintainer "The Infrastructure Company GmbH " ARG DEBIAN_FRONTEND=noninteractive ARG CODENAME=bullseye diff --git a/data/Dockerfiles/sogo/Dockerfile b/data/Dockerfiles/sogo/Dockerfile index da8f23be..a1ef95bb 100644 --- a/data/Dockerfiles/sogo/Dockerfile +++ b/data/Dockerfiles/sogo/Dockerfile @@ -1,5 +1,5 @@ FROM debian:bullseye-slim -LABEL maintainer "Andre Peters " +LABEL maintainer "The Infrastructure Company GmbH " ARG DEBIAN_FRONTEND=noninteractive ARG SOGO_DEBIAN_REPOSITORY=http://packages.sogo.nu/nightly/5/debian/ diff --git a/data/Dockerfiles/unbound/Dockerfile b/data/Dockerfiles/unbound/Dockerfile index d9756d04..e853082d 100644 --- a/data/Dockerfiles/unbound/Dockerfile +++ b/data/Dockerfiles/unbound/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.17 -LABEL maintainer "Andre Peters " +LABEL maintainer "The Infrastructure Company GmbH " RUN apk add --update --no-cache \ curl \