From d455423ae142205e462256baa2e9068c4a88d212 Mon Sep 17 00:00:00 2001 From: admin Date: Sun, 22 Feb 2026 18:55:39 +0100 Subject: [PATCH] =?UTF-8?q?feat(deploy):=20vollst=C3=A4ndige=20Containerl?= =?UTF-8?q?=C3=B6sung?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- deploy/dockerfile | 5 +++ deploy/hooks.json | 46 ++++++++++------------ docker/bruchtal-webhook/docker-compose.yml | 11 ++++++ 3 files changed, 36 insertions(+), 26 deletions(-) create mode 100644 deploy/dockerfile diff --git a/deploy/dockerfile b/deploy/dockerfile new file mode 100644 index 0000000..cfef56d --- /dev/null +++ b/deploy/dockerfile @@ -0,0 +1,5 @@ +FROM alpine:3.19 + +RUN apk add --no-cache git docker-cli bash + +WORKDIR /workspace \ No newline at end of file diff --git a/deploy/hooks.json b/deploy/hooks.json index 77d567f..f1b8307 100644 --- a/deploy/hooks.json +++ b/deploy/hooks.json @@ -1,31 +1,25 @@ [ { "id": "bruchtal-deploy", - "execute-command": "/docker/Bruchtal/deploy/deploy-bruchtal.sh", - "command-working-directory": "/docker/Bruchtal", - "trigger-rule": { - "and": [ - { - "match": { - "type": "payload-hmac-sha256", - "secret": "!!Zazen17**", - "parameter": { - "source": "header", - "name": "X-Gitea-Signature" - } - } - }, - { - "match": { - "type": "value", - "parameter": { - "source": "payload", - "name": "ref" - }, - "value": "refs/heads/main" - } - } - ] - } + "execute-command": "docker", + "command-working-directory": "/", + "pass-arguments-to-command": [ + { + "source": "string", + "name": "exec" + }, + { + "source": "string", + "name": "bruchtal-deploy" + }, + { + "source": "string", + "name": "bash" + }, + { + "source": "string", + "name": "/workspace/deploy/deploy-bruchtal.sh" + } + ] } ] \ No newline at end of file diff --git a/docker/bruchtal-webhook/docker-compose.yml b/docker/bruchtal-webhook/docker-compose.yml index d5bbe9f..c817b17 100644 --- a/docker/bruchtal-webhook/docker-compose.yml +++ b/docker/bruchtal-webhook/docker-compose.yml @@ -12,6 +12,17 @@ services: - /docker/Bruchtal:/docker/Bruchtal:rw command: ["-hooks", "/hooks/hooks.json", "-verbose", "-port", "9001", "-ip", "0.0.0.0"] + + bruchtal-deploy: + build: ./deploy + container_name: bruchtal-deploy + networks: + - bruchtal-net + volumes: + - /docker/Bruchtal:/workspace + - /var/run/docker.sock:/var/run/docker.sock + entrypoint: ["sleep", "infinity"] + networks: bruchtal-net: external: true \ No newline at end of file