From 541236043b9b4d1d14b3e45dc6a57429511e2e2b Mon Sep 17 00:00:00 2001
From: Patrick Niebeling <gnilebein@noreply.example.org>
Date: Wed, 20 Nov 2024 10:30:12 +0000
Subject: [PATCH] PAKET (#4)

Co-authored-by: Patrick Niebeling <patrick.niebeling@adacor.com>
Reviewed-on: https://gitea.gnilebein.de/gnilebein/Docker-rspamd/pulls/4
---
 .gitea/workflows/deploy.yaml | 31 +++++++++++++++++++++++++++++++
 .vscode/settings.json        |  5 +++++
 StableV2/Dockerfile          | 15 ++++++---------
 3 files changed, 42 insertions(+), 9 deletions(-)
 create mode 100644 .gitea/workflows/deploy.yaml
 create mode 100644 .vscode/settings.json

diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml
new file mode 100644
index 0000000..51230a4
--- /dev/null
+++ b/.gitea/workflows/deploy.yaml
@@ -0,0 +1,31 @@
+name: Deploy Container Image to Registry
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  build-image:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v4
+      - name: Build Image
+        run: |
+          echo "[***] Build hook running"
+          cd ${{ gitea.workspace }}/StableV2/
+          VERSION=$(git ls-remote --tags -q https://github.com/rspamd/rspamd | sed -n "s/^[[:xdigit:]]\{40\}[[:blank:]]refs\/tags\/\([0-9]\{1\}\.[0-9]\{1,2\}\($\|\.[0-9]\{1,2\}$\)\)/\1/p" | sort --version-sort | tail -1)
+
+          docker build \
+          --build-arg VERSION=${VERSION} \
+          --build-arg COMMIT=$(git ls-remote --tags -q https://github.com/rspamd/rspamd | sed -n "s/^\([[:xdigit:]]\{40\}\)[[:blank:]]refs\/tags\/${VERSION}^{}$/\1/p" |  xargs git rev-parse --short) \
+          --build-arg BRANCH=$(git rev-parse --abbrev-ref HEAD) \
+          --build-arg DATE=$(date -u +"%Y-%m-%dT%H:%M:%SZ") \
+          -t ${{ vars.DOCKER_REPO }}/gnilebein/${{ vars.IMAGE_NAME }} -t ${{ vars.DOCKER_REPO }}/gnilebein/${{ vars.IMAGE_NAME }}:$VERSION .
+      - name: Push Image
+        run: |
+          echo '${{ vars.DOCKER_AUTH_CONFIG }}' > ~/.docker/config.json
+          cat ~/.docker/config.json
+          VERSION=$(git ls-remote --tags -q https://github.com/rspamd/rspamd | sed -n "s/^[[:xdigit:]]\{40\}[[:blank:]]refs\/tags\/\([0-9]\{1\}\.[0-9]\{1,2\}\($\|\.[0-9]\{1,2\}$\)\)/\1/p" | sort --version-sort | tail -1)
+          docker push ${{ vars.DOCKER_REPO }}/gnilebein/${{ vars.IMAGE_NAME }}
+          docker push ${{ vars.DOCKER_REPO }}/gnilebein/${{ vars.IMAGE_NAME }}:${VERSION}
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..d4fe162
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,5 @@
+{
+    "yaml.schemas": {
+        "https://json.schemastore.org/github-workflow.json": "file:///c%3A/Users/patrick.niebeling/Documents/gitRepos%20-%20privat/Docker-rspamd/.gitea/workflows/deploy.yaml"
+    }
+}
\ No newline at end of file
diff --git a/StableV2/Dockerfile b/StableV2/Dockerfile
index ba38408..c7a1af4 100644
--- a/StableV2/Dockerfile
+++ b/StableV2/Dockerfile
@@ -13,12 +13,12 @@ ENV DEBIAN_FRONTEND=noninteractive
 
 LABEL org.label-schema.name="Rspamd" \
 	org.label-schema.description="Rspamd Spam Filter - STABLE" \
-	org.label-schema.usage="https://hub.docker.com/r/gnilebein/rspamd/" \
+	org.label-schema.usage="https://gitea.gnilebein.de/gnilebein/-/packages/container/docker-rspamd/latest" \
 	org.label-schema.url="https://rspamd.com" \
 	org.label-schema.vendor="gnilebein" \
 	org.label-schema.schema-version="1.0" \
 	org.label-schema.version=$VERSION \
-	org.label-schema.vcs-url="https://github.com/rspamd/rspamd/" \
+	org.label-schema.vcs-url="https://gitea.gnilebein.de/gnilebein/Docker-rspamd" \
 	org.label-schema.vcs-ref=$COMMIT \
 	org.label-schema.build-date=$DATE
 
@@ -56,14 +56,11 @@ COPY set_worker_password.sh /set_worker_password.sh
 COPY docker-entrypoint.sh /docker-entrypoint.sh
 
 # # Keep database and configuration persistent
-# VOLUME /etc/rspamd/local.d
-# VOLUME /etc/rspamd/override.d
-# VOLUME /etc/rspamd/custom
-# VOLUME /var/lib/rspamd
+VOLUME /etc/rspamd/local.d
+VOLUME /etc/rspamd/override.d
+VOLUME /etc/rspamd/custom
+VOLUME /var/lib/rspamd
 
-# Port 11334 is for web frontend
-# Port 11332 is for milter
-# Port 11333 is for worker
 EXPOSE 11332 11333 11334
 
 # Healtcheck if Rspamd is returning stats