diff --git a/deploy/Dockerfile b/deploy/Dockerfile new file mode 100644 index 0000000..02e894d --- /dev/null +++ b/deploy/Dockerfile @@ -0,0 +1,3 @@ +FROM thecatlady/webhook:2.8.0 +USER root +RUN apk add --no-cache git docker-cli bash \ No newline at end of file diff --git a/deploy/dockerfile b/deploy/dockerfile deleted file mode 100644 index cfef56d..0000000 --- a/deploy/dockerfile +++ /dev/null @@ -1,5 +0,0 @@ -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 f1b8307..20bdd6d 100644 --- a/deploy/hooks.json +++ b/deploy/hooks.json @@ -1,25 +1,7 @@ [ { "id": "bruchtal-deploy", - "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" - } - ] + "execute-command": "/workspace/deploy/deploy-bruchtal.sh", + "command-working-directory": "/workspace" } ] \ No newline at end of file diff --git a/docker/bruchtal-webhook/docker-compose.yml b/docker/bruchtal-webhook/docker-compose.yml index c817b17..8095494 100644 --- a/docker/bruchtal-webhook/docker-compose.yml +++ b/docker/bruchtal-webhook/docker-compose.yml @@ -1,28 +1,12 @@ -version: "3.8" - services: bruchtal-webhook: - image: thecatlady/webhook:2.8.0 + build: ./deploy container_name: bruchtal-webhook restart: unless-stopped - networks: - - bruchtal-net # 👈 neu für gitea - volumes: - - /docker/Bruchtal/deploy/hooks.json:/hooks/hooks.json:ro - - /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 + ports: + - "9001:9001" volumes: - /docker/Bruchtal:/workspace + - /docker/Bruchtal/deploy/hooks.json:/hooks/hooks.json:ro - /var/run/docker.sock:/var/run/docker.sock - entrypoint: ["sleep", "infinity"] - -networks: - bruchtal-net: - external: true \ No newline at end of file + command: ["-hooks", "/hooks/hooks.json", "-verbose", "-port", "9001", "-ip", "0.0.0.0"] \ No newline at end of file