diff --git a/.gitea/workflows/container.yaml b/.gitea/workflows/container.yaml deleted file mode 100644 index e48b3fd..0000000 --- a/.gitea/workflows/container.yaml +++ /dev/null @@ -1,12 +0,0 @@ -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/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..914567c --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,18 @@ +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" diff --git a/Containerfile b/Dockerfile similarity index 57% rename from Containerfile rename to Dockerfile index 16fc7e3..3935c7a 100644 --- a/Containerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/thallian/confd-env:3.19-3.1.6.2 +FROM thallian/confd-env:latest RUN apk --no-cache add \ rspamd \ diff --git a/rootfs/etc/rspamd/local.d/dkim_signing.conf b/rootfs/etc/rspamd/local.d/dkim_signing.conf index 41fa64f..69408b3 100644 --- a/rootfs/etc/rspamd/local.d/dkim_signing.conf +++ b/rootfs/etc/rspamd/local.d/dkim_signing.conf @@ -4,4 +4,3 @@ 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/settings.conf b/rootfs/etc/rspamd/local.d/settings.conf deleted file mode 100644 index 2b4b49c..0000000 --- a/rootfs/etc/rspamd/local.d/settings.conf +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index d325b52..0000000 --- a/rootfs/etc/rspamd/local.d/spf.conf +++ /dev/null @@ -1 +0,0 @@ -disable_ipv6 = false; diff --git a/rootfs/etc/rspamd/local.d/worker-proxy.inc b/rootfs/etc/rspamd/local.d/worker-proxy.inc deleted file mode 100644 index 06e2bce..0000000 --- a/rootfs/etc/rspamd/local.d/worker-proxy.inc +++ /dev/null @@ -1 +0,0 @@ -bind_socket = "0.0.0.0:11332"; diff --git a/rootfs/etc/rspamd/override.d/options.inc b/rootfs/etc/rspamd/override.d/options.inc deleted file mode 100644 index f8c4fff..0000000 --- a/rootfs/etc/rspamd/override.d/options.inc +++ /dev/null @@ -1 +0,0 @@ -local_addrs = ["127.0.0.1"];