running

docker-compose.yml

@@ -1,11 +1,10 @@
+
 version: '3.5'
 services:
 
   sqldb:
     image: mysql:5.7
     environment:
-      - PUID=1001
-      - PGID=1001
       - MYSQL_DATABASE=kimai
       - MYSQL_USER=kimaiuser
       - MYSQL_PASSWORD=kimaipassword
@@ -15,109 +14,58 @@ services:
     command: --default-storage-engine innodb
     restart: unless-stopped
     healthcheck:
-      test: mysqladmin -pchangemeplease ping -h localhost
+      test: mysqladmin -p$$MYSQL_ROOT_PASSWORD ping -h localhost
       interval: 20s
-#      start_period: 10s
+      start_period: 10s
-#      timeout: 10s
+      timeout: 10s
-#      retries: 3
+      retries: 3
     networks:
      kimai_backend:
      
 
-
-  nginx:
-    build: compose
-#    ports:
-#      - 8001:80
-    environment:
-      - 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
-    restart: unless-stopped
-    depends_on:
-      - kimai
-#    healthcheck:
-#      test:  wget --spider http://nginx/health || exit 1
-#      interval: 20s
-#      start_period: 10s
-#      timeout: 10s
-#      retries: 3
-    networks:
-     kimai_backend:
-     franvproxy_test_proxy-tier:
-
   kimai:
-    image: kimai/kimai2:fpm-alpine-1.5-prod
+    image: kimai/kimai2:apache
     environment:
-      - PUID=1001
-      - PGID=1001
-      - APP_ENV=prod
-      - TRUSTED_HOSTS=time.airdog.site
-#      - TRUSTED_HOSTS=167.86.125.173
-#      - TRUSTED_PROXY=nginx-proxy
       - ADMINMAIL=admin@kimai.local
       - ADMINPASS=changemeplease
-      - TZ=America/Vancouver
+      - DATABASE_URL=mysql://kimaiuser:kimaipassword@sqldb/kimai
-    volumes:
+      - VIRTUAL_HOST=time.franv.site
-      - public:/opt/kimai/public
+      - LETSENCRYPT_HOST=time.franv.site
-      - var:/opt/kimai/var
+      - VIRTUAL_PORT=8001      
-      # - ./ldap.conf:/etc/openldap/ldap.conf:z
+      - TRUSTED_HOSTS=time.franv.site,nginx,localhost,127.0.0.1
-      # - ./ROOT-CA.pem:/etc/ssl/certs/ROOT-CA.pem:z
+      - MAILER_URL=smtp://kimai_sendemail:587
     restart: unless-stopped
-    healthcheck:
+    networks:
-      test: wget --spider http://nginx || exit 1
+     kimai_backend:
-      interval: 20s
+     acme-companion_proxy-tier:
-#      start_period: 10s
+     
-#      timeout: 10s
+     
-#      retries: 3
+  kimai_sendemail:
+    image: boky/postfix
+    container_name: kimai_sendemail
+    restart: always
+    networks:
+      - kimai_backend
+    environment:
+      - HOSTNAME=kimai_sendemail
+      - RELAYHOST=smtp.fastmail.com:587
+      - RELAYHOST_USERNAME=airdog@fastmail.com
+      - RELAYHOST_PASSWORD=b72sg488wre47c29
+      - ALLOWED_SENDER_DOMAINS=franv.site,kimai
+#      - VIRTUAL_PORT=587      
+#      - INBOUND_DEBUGGING=1
+      - MYNETWORKS=allow domains from per Network ( default 127.0.0.0/8,10.0.0.0/8,172.26.0.0/16,192.168.0.0/16 )
+#    ports:
+#      - '1588:587'
     networks:
      kimai_backend:
 
-  kimai-backup:
-      image: drahoslavzan/mariadb-backup-s3:latest
-      container_name: kimai-backup
-      depends_on:
-        - sqldb      
-      restart: always
-      volumes:
-        - /opt/backup:/backup
-      environment:
-        - PUID=1002
-        - PGID=1002      
-        - CRON_SCHEDULE=17 1 * * *
-        - BACKUP_FILE=mariadb
-        - MYSQL_HOST=sqldb
-        - MYSQL_USER=root
-        - MYSQL_PASS=changemeplease       
-        - AWS_ACCESS_KEY_ID=AKIAJER447UGIFJ2EADQ
-        - AWS_SECRET_ACCESS_KEY=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
-        - AWS_DEFAULT_REGION=us-west-2
-        - AWS_BUCKET_DIR=s3://calodbbackup/kimai
-      networks:
-       kimai_backend:
      
      
-#  postfix:
-#    image: catatnight/postfix:latest
-#    environment:
-#      maildomain: neontribe.co.uk
-#      smtp_user: kimai:kimai
-#    restart: unless-stopped
-#    restart: always
      
-volumes:
-    var:
-    public:
 
 networks:
   kimai_backend:
-  franvproxy_test_proxy-tier:
+  acme-companion_proxy-tier:
     external: true