From 058262a6274ae499925f3fbad8d4602d4b217c7e Mon Sep 17 00:00:00 2001 From: fossilfranv Date: Tue, 20 Oct 2020 09:58:01 -0700 Subject: [PATCH] moving to zabbix --- docker-compose.yml | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 85e7def..5e8e6bc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,6 +4,8 @@ services: sqldb: image: mysql:5.7 environment: + - PUID=1001 + - PGID=1001 - MYSQL_DATABASE=kimai - MYSQL_USER=kimaiuser - MYSQL_PASSWORD=kimaipassword @@ -18,19 +20,23 @@ services: # start_period: 10s # timeout: 10s # retries: 3 + networks: + kimai_backend: + + nginx: build: compose # ports: # - 8001:80 environment: - - VIRTUAL_HOST=time.franv.site - - LETSENCRYPT_HOST=time.franv.site + - PUID=1001 + - PGID=1001 + - VIRTUAL_HOST=time.airdog.site + - LETSENCRYPT_HOST=time.airdog.site - LETSENCRYPT_EMAIL=ouch@thetrauma.org - VIRTUAL_PORT=8001 - TRUSTED_PROXY=nginx-proxy - - volumes: - ./compose/nginx_site.conf:/etc/nginx/conf.d/default.conf:ro - public:/opt/kimai/public:ro @@ -43,20 +49,19 @@ services: # start_period: 10s # timeout: 10s # retries: 3 + networks: + kimai_backend: + franvproxy_test_proxy-tier: kimai: image: kimai/kimai2:fpm-alpine-1.5-prod environment: + - PUID=1001 + - PGID=1001 - APP_ENV=prod - - TRUSTED_HOSTS=time.franv.site + - TRUSTED_HOSTS=time.airdog.site # - TRUSTED_HOSTS=167.86.125.173 # - TRUSTED_PROXY=nginx-proxy -# - VIRTUAL_HOST=time.franv.site -# - LETSENCRYPT_HOST=time.franv.site -# - LETSENCRYPT_EMAIL=ouch@thetrauma.org -# - VIRTUAL_PORT=8001 - - - ADMINMAIL=admin@kimai.local - ADMINPASS=changemeplease volumes: @@ -71,6 +76,8 @@ services: # start_period: 10s # timeout: 10s # retries: 3 + networks: + kimai_backend: # postfix: # image: catatnight/postfix:latest @@ -85,7 +92,7 @@ volumes: public: networks: - default: - external: - name: franvproxy_proxy-tier + kimai_backend: + franvproxy_test_proxy-tier: + external: true