From ce15c45889656cef5775dd13816b233684112552 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Tue, 12 Jul 2022 19:51:51 +0200 Subject: [PATCH 01/10] update base image --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3935c7a..de0a5fc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM thallian/confd-env:latest +FROM docker.io/thallian/confd-env:3.16 RUN apk --no-cache add \ rspamd \ From 6a333dfe3f02504047baa2ff40de3ecc255eceb4 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Sat, 10 Sep 2022 20:19:51 +0200 Subject: [PATCH 02/10] delete local network definition --- rootfs/etc/rspamd/override.d/options.inc | 1 + 1 file changed, 1 insertion(+) create mode 100644 rootfs/etc/rspamd/override.d/options.inc diff --git a/rootfs/etc/rspamd/override.d/options.inc b/rootfs/etc/rspamd/override.d/options.inc new file mode 100644 index 0000000..8c9cf63 --- /dev/null +++ b/rootfs/etc/rspamd/override.d/options.inc @@ -0,0 +1 @@ +local_addrs = []; From 06ecbe3e28e827b387f047ccd90112a7662d86de Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Sat, 10 Sep 2022 22:11:57 +0200 Subject: [PATCH 03/10] add localhost to trustet nets --- rootfs/etc/rspamd/override.d/options.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rootfs/etc/rspamd/override.d/options.inc b/rootfs/etc/rspamd/override.d/options.inc index 8c9cf63..f8c4fff 100644 --- a/rootfs/etc/rspamd/override.d/options.inc +++ b/rootfs/etc/rspamd/override.d/options.inc @@ -1 +1 @@ -local_addrs = []; +local_addrs = ["127.0.0.1"]; From 34da1ade123dfb55c86011f26b426906803546dc Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Sat, 10 Sep 2022 23:24:49 +0200 Subject: [PATCH 04/10] skip some checks for authenticated senders --- rootfs/etc/rspamd/local.d/settings.conf | 7 +++++++ rootfs/etc/rspamd/local.d/spf.conf | 1 + 2 files changed, 8 insertions(+) create mode 100644 rootfs/etc/rspamd/local.d/settings.conf create mode 100644 rootfs/etc/rspamd/local.d/spf.conf diff --git a/rootfs/etc/rspamd/local.d/settings.conf b/rootfs/etc/rspamd/local.d/settings.conf new file mode 100644 index 0000000..2b4b49c --- /dev/null +++ b/rootfs/etc/rspamd/local.d/settings.conf @@ -0,0 +1,7 @@ +authenticated { + priority = high; + authenticated = yes; + apply { + groups_disabled = ["rbl", "spf"]; + } +} diff --git a/rootfs/etc/rspamd/local.d/spf.conf b/rootfs/etc/rspamd/local.d/spf.conf new file mode 100644 index 0000000..d325b52 --- /dev/null +++ b/rootfs/etc/rspamd/local.d/spf.conf @@ -0,0 +1 @@ +disable_ipv6 = false; From 3224edb0677921f673338015b5b978d663b494d6 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Sat, 29 Oct 2022 09:30:39 +0200 Subject: [PATCH 05/10] listen on all interfaces --- rootfs/etc/rspamd/local.d/dkim_signing.conf | 1 + rootfs/etc/rspamd/local.d/worker-proxy.inc | 1 + 2 files changed, 2 insertions(+) create mode 100644 rootfs/etc/rspamd/local.d/worker-proxy.inc diff --git a/rootfs/etc/rspamd/local.d/dkim_signing.conf b/rootfs/etc/rspamd/local.d/dkim_signing.conf index 69408b3..41fa64f 100644 --- a/rootfs/etc/rspamd/local.d/dkim_signing.conf +++ b/rootfs/etc/rspamd/local.d/dkim_signing.conf @@ -4,3 +4,4 @@ path = "/var/lib/rspamd/dkim/$domain.$selector.key"; selector_map = "/etc/rspamd/dkim_selectors.map"; +allow_username_mismatch = true; diff --git a/rootfs/etc/rspamd/local.d/worker-proxy.inc b/rootfs/etc/rspamd/local.d/worker-proxy.inc new file mode 100644 index 0000000..06e2bce --- /dev/null +++ b/rootfs/etc/rspamd/local.d/worker-proxy.inc @@ -0,0 +1 @@ +bind_socket = "0.0.0.0:11332"; From d6a585da5ffed3678a2a370f6ecc2d987474e0e1 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Fri, 11 Nov 2022 07:48:51 +0000 Subject: [PATCH 06/10] Delete '.gitlab-ci.yml' --- .gitlab-ci.yml | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index 914567c..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,18 +0,0 @@ -variables: - CONTAINER_NAME: thallian/rspamd - -build: - stage: build - image: - name: gcr.io/kaniko-project/executor:debug - entrypoint: [""] - script: - - mkdir -p /kaniko/.docker - - echo "{\"auths\":{\"$CI_REGISTRY\":{\"auth\":\"$(printf "%s:%s" "$CI_REGISTRY_USER" "$CI_REGISTRY_PASSWORD" | base64 | tr -d '\n')\"}}}" > /kaniko/.docker/config.json - - >- - /kaniko/executor - --context "$CI_PROJECT_DIR" - --dockerfile "$CI_PROJECT_DIR/Dockerfile" - --destination "$CONTAINER_NAME:$CI_COMMIT_SHA" - --destination "$CONTAINER_NAME:$CI_COMMIT_REF_NAME" - --destination "$CONTAINER_NAME:latest" From ff67316f6e9c367d3cb60501e93045d0170f0f75 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Fri, 11 Nov 2022 07:49:30 +0000 Subject: [PATCH 07/10] Add '.woodpecker.yml' --- .woodpecker.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .woodpecker.yml diff --git a/.woodpecker.yml b/.woodpecker.yml new file mode 100644 index 0000000..7144b8a --- /dev/null +++ b/.woodpecker.yml @@ -0,0 +1,11 @@ +pipeline: + publish-docker-image: + image: plugins/kaniko + settings: + repo: docker.io/thallian/rspamd + tags: latest,${CI_COMMIT_SHA:0:8},${CI_COMMIT_TAG=pre} + dockerfile: Dockerfile + username: + from_secret: DOCKER_USER + password: + from_secret: DOCKER_PW \ No newline at end of file From 6e09e62fd6bf5ca07e4e71da3ae45db1217b3bc6 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Wed, 23 Nov 2022 17:48:32 +0100 Subject: [PATCH 08/10] push to alpine 3.17 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index de0a5fc..1c6298a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/thallian/confd-env:3.16 +FROM docker.io/thallian/confd-env:3.17 RUN apk --no-cache add \ rspamd \ From c2037806bc93f1405261e6d77cd808d993e038f6 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Tue, 26 Sep 2023 15:59:18 +0200 Subject: [PATCH 09/10] push to 3.6 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1c6298a..d9a5dba 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/thallian/confd-env:3.17 +FROM docker.io/thallian/confd-env:3.18-3.1.5.0 RUN apk --no-cache add \ rspamd \ From 019484a49d5b6133c84efd463071094012c1a2cb Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Mon, 1 Jan 2024 16:57:06 +0100 Subject: [PATCH 10/10] use newest alpine --- .gitea/workflows/container.yaml | 12 ++++++++++++ .woodpecker.yml | 11 ----------- Dockerfile => Containerfile | 2 +- 3 files changed, 13 insertions(+), 12 deletions(-) create mode 100644 .gitea/workflows/container.yaml delete mode 100644 .woodpecker.yml rename Dockerfile => Containerfile (57%) diff --git a/.gitea/workflows/container.yaml b/.gitea/workflows/container.yaml new file mode 100644 index 0000000..e48b3fd --- /dev/null +++ b/.gitea/workflows/container.yaml @@ -0,0 +1,12 @@ +name: Build Multiarch Container Image +on: [push] +jobs: + call-reusable-workflow: + uses: container/multiarch-build-workflow/.gitea/workflows/build.yaml@main + with: + repository: ${{ gitea.repository }} + ref_name: ${{ gitea.ref_name }} + sha: ${{ gitea.sha }} + registry_url: ${{ secrets.REGISTRY_URL }} + registry_user: ${{ secrets.REGISTRY_USER }} + registry_pw: ${{ secrets.REGISTRY_PW }} diff --git a/.woodpecker.yml b/.woodpecker.yml deleted file mode 100644 index 7144b8a..0000000 --- a/.woodpecker.yml +++ /dev/null @@ -1,11 +0,0 @@ -pipeline: - publish-docker-image: - image: plugins/kaniko - settings: - repo: docker.io/thallian/rspamd - tags: latest,${CI_COMMIT_SHA:0:8},${CI_COMMIT_TAG=pre} - dockerfile: Dockerfile - username: - from_secret: DOCKER_USER - password: - from_secret: DOCKER_PW \ No newline at end of file diff --git a/Dockerfile b/Containerfile similarity index 57% rename from Dockerfile rename to Containerfile index d9a5dba..16fc7e3 100644 --- a/Dockerfile +++ b/Containerfile @@ -1,4 +1,4 @@ -FROM docker.io/thallian/confd-env:3.18-3.1.5.0 +FROM docker.io/thallian/confd-env:3.19-3.1.6.2 RUN apk --no-cache add \ rspamd \