From 09d79f6587266d2cdc7ade0d3bdd0804ed7c4b7b Mon Sep 17 00:00:00 2001 From: Peter Smit Date: Thu, 16 Jan 2025 16:26:39 +0100 Subject: [PATCH] Add updater container (spannend hoor) --- docker-compose.yml | 1 + update | 3 -- updater/.env.example | 2 ++ updater/Dockerfile | 16 +++++++++ updater/docker-compose.yml | 9 +++++ updater/webhook.php | 71 ++++++++++++++++++++++++++++++++++++++ 6 files changed, 99 insertions(+), 3 deletions(-) delete mode 100755 update create mode 100644 updater/.env.example create mode 100644 updater/Dockerfile create mode 100644 updater/docker-compose.yml create mode 100644 updater/webhook.php diff --git a/docker-compose.yml b/docker-compose.yml index 0bc386d..1d53dad 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,4 +5,5 @@ include: - paperless/docker-compose.yml - pingvin/docker-compose.yml - pocketid/docker-compose.yml + - updater/docker-compose.yml - vaultwarden/docker-compose.yml \ No newline at end of file diff --git a/update b/update deleted file mode 100755 index 7557b5d..0000000 --- a/update +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -cd /data/docker-config -git pull && docker compose up -d diff --git a/updater/.env.example b/updater/.env.example new file mode 100644 index 0000000..19d2ac6 --- /dev/null +++ b/updater/.env.example @@ -0,0 +1,2 @@ +GITEA_WEBHOOK_SECRET= +DOCKER_CONFIG_DIR= \ No newline at end of file diff --git a/updater/Dockerfile b/updater/Dockerfile new file mode 100644 index 0000000..4d9942c --- /dev/null +++ b/updater/Dockerfile @@ -0,0 +1,16 @@ +# Use the official PHP image with Apache +FROM php:8.1-apache + +# Install git and docker-compose +RUN apt-get update && \ + apt-get install -y git docker-compose && \ + rm -rf /var/lib/apt/lists/* + +# Copy the PHP file to the Apache document root +COPY webhook.php /var/www/html/index.php + +# Expose port 80 +EXPOSE 80 + +# Start Apache server +CMD ["apache2-foreground"] \ No newline at end of file diff --git a/updater/docker-compose.yml b/updater/docker-compose.yml new file mode 100644 index 0000000..fa74e92 --- /dev/null +++ b/updater/docker-compose.yml @@ -0,0 +1,9 @@ +services: + updater: + build: . + ports: + - "6969:80" + env_file: + - .env + volumes: + - ${DOCKER_CONFIG_DIR}:/config \ No newline at end of file diff --git a/updater/webhook.php b/updater/webhook.php new file mode 100644 index 0000000..cb7f490 --- /dev/null +++ b/updater/webhook.php @@ -0,0 +1,71 @@ + /proc/1/fd/1 2>/proc/1/fd/2 &'); + +// send return code and text message +http_response_code(200); +echo 'lekker pik'; + +