From 3a35ab75a771297874fde24c0ee2b5d22fd1e4c1 Mon Sep 17 00:00:00 2001 From: borgal Date: Wed, 22 Dec 2021 21:31:04 +0000 Subject: [PATCH] =?UTF-8?q?Watchtower=20und=20Ausnahmen=20f=C3=BCr=20Cloud?= =?UTF-8?q?=20und=20Web=20hinzugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cloud/docker-compose.yml | 6 ++++ code-server/docker-compose.yml | 4 +-- watchtower/docker-compose.yml | 21 ++++++++++++ web/.env.sample | 8 +++++ web/Dockerfile | 2 ++ web/docker-compose.yml | 60 ++++++++++++++++++++++++++++++++++ 6 files changed, 99 insertions(+), 2 deletions(-) create mode 100644 watchtower/docker-compose.yml create mode 100644 web/.env.sample create mode 100644 web/Dockerfile create mode 100644 web/docker-compose.yml diff --git a/cloud/docker-compose.yml b/cloud/docker-compose.yml index 54a45c7..de55245 100644 --- a/cloud/docker-compose.yml +++ b/cloud/docker-compose.yml @@ -15,6 +15,9 @@ services: - MYSQL_PASSWORD=${MYSQL_PASSWORD} - MYSQL_DATABASE=${MYSQL_DATABASE} - MYSQL_USER=${MYSQL_USER} + labels: + - "com.centurylinklabs.watchtower.enable=false" + cloud_redis: image: redis:alpine @@ -40,6 +43,9 @@ services: - cloud:/data ports: - 8100:443 + labels: + - "com.centurylinklabs.watchtower.enable=false" + restart: unless-stopped volumes: diff --git a/code-server/docker-compose.yml b/code-server/docker-compose.yml index 6c2065c..5df3d87 100644 --- a/code-server/docker-compose.yml +++ b/code-server/docker-compose.yml @@ -5,8 +5,8 @@ services: image: ghcr.io/linuxserver/code-server container_name: code-server environment: - - PUID=33 - - PGID=33 + - PUID=80 + - PGID=80 - TZ=Europe/Berlin - PASSWORD=${PASSWORD} - SUDO_PASSWORD=${SUDO_PASSWORD} diff --git a/watchtower/docker-compose.yml b/watchtower/docker-compose.yml new file mode 100644 index 0000000..5a284f1 --- /dev/null +++ b/watchtower/docker-compose.yml @@ -0,0 +1,21 @@ +version: "3" + +services: + watchtower: + container_name: watchtower + image: containrrr/watchtower + + environment: + - WATCHTOWER_NOTIFICATIONS=gotify + - WATCHTOWER_NOTIFICATION_GOTIFY_URL=https://gotify.borgal.de + - WATCHTOWER_NOTIFICATION_GOTIFY_TOKEN=AlsHK7YQ17in5Ns + - TZ=Europe/Berlin + + volumes: + - /var/run/docker.sock:/var/run/docker.sock + - /etc/localtime:/etc/localtime:ro + + #command: --monitor-only --schedule "0 09 22 * * *" + command: --rolling-restart --schedule "0 15 19 * * *" --cleanup --include-restarting --include-stopped + + restart: unless-stopped diff --git a/web/.env.sample b/web/.env.sample new file mode 100644 index 0000000..1f80ca1 --- /dev/null +++ b/web/.env.sample @@ -0,0 +1,8 @@ +#MySQL Datenbank +MYSQL_USER=changeMe +MYSQL_PASSWORD=changeMe +MYSQL_ROOT_PASSWORD=changeMe + +NFS_SERVER=192.168.0.xxx # oder hostname oder Domain +PFAD_1=/Pfad/zum/Ordner/www +PFAD_2=/Pfad/zum/Ordner/energie \ No newline at end of file diff --git a/web/Dockerfile b/web/Dockerfile new file mode 100644 index 0000000..cce6821 --- /dev/null +++ b/web/Dockerfile @@ -0,0 +1,2 @@ +FROM php:7.4.3-apache +RUN docker-php-ext-install mysqli \ No newline at end of file diff --git a/web/docker-compose.yml b/web/docker-compose.yml new file mode 100644 index 0000000..f357291 --- /dev/null +++ b/web/docker-compose.yml @@ -0,0 +1,60 @@ +version: "2" + +services: + webserver: + build: . + container_name: webserver-app + ports: + - "8180:80" + environment: + - TZ=Europe/Berlin + volumes: + - www:/var/www/html + - energie:/var/www/html/knx/archiv + - /etc/localtime:/etc/localtime:ro + links: + - database + labels: + - "com.centurylinklabs.watchtower.enable=false" + restart: unless-stopped + + database: + image: mariadb:latest + container_name: webserver_db + environment: + - MYSQL_USER=${MYSQL_USER} + - MYSQL_PASSWORD=${MYSQL_PASSWORD} + - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} + - TZ=Europe/Berlin + volumes: + - ./dbdata:/var/lib/mysql + - /etc/localtime:/etc/localtime:ro + restart: unless-stopped + + phpmyadmin: + image: phpmyadmin/phpmyadmin + container_name: web_phpmyadmin + links: + - database:db + ports: + - 8087:80 + environment: + - TZ=Europe/Berlin + restart: unless-stopped + +volumes: + www: + name: www + driver: local + driver_opts: + type: nfs + o: addr=${NFS_SERVER},rw + device: ":${PFAD_1}" + + energie: + name: energie + driver: local + driver_opts: + type: nfs + o: addr=${NFS_SERVER},rw + device: ":${PFAD_2}" \ No newline at end of file