docker-compose.yml

@@ -1,9 +1,4 @@
-version: '3.4'
+version: '3'
-
-x-common-environment: &common-environment
-  PUID: 1000
-  PGID: 1000
-  TZ: Europe/Helsinki
 
 services:
 
@@ -16,7 +11,8 @@ services:
       - ./bind9/local.db:/etc/bind/local.db
       - ./bind9/lan.db:/etc/bind/lan.db
       - ./bind9/guiotte.db:/etc/bind/guiotte.db
-    environment: *common-environment
+    environment:
+      - TZ=CEST
     ports:
       - "53:53/udp"
 
@@ -27,12 +23,14 @@ services:
     cap_add:
       - NET_ADMIN
     environment:
-      <<: *common-environment
+      - PUID=1000
-      URL: guiotte.fr
+      - PGID=1000
-      SUBDOMAINS: wildcard
+      - TZ=CEST
-      VALIDATION: dns
+      - URL=guiotte.fr
-      DNSPLUGIN: ovh
+      - SUBDOMAINS=wildcard
-      EMAIL: florent@guiotte.fr
+      - VALIDATION=dns
+      - DNSPLUGIN=ovh
+      - EMAIL=florent@guiotte.fr
     volumes:
       - ./swag:/config
     ports:
@@ -43,7 +41,10 @@ services:
     image: lscr.io/linuxserver/ddclient:latest
     container_name: ddclient
     restart: unless-stopped
-    environment: *common-environment
+    environment:
+      - PUID=1000
+      - PGID=1000
+      - TZ=CEST
     volumes:
       - ./ddclient:/config
 
@@ -96,7 +97,7 @@ services:
         #    environment:
         #      - PUID=1000
         #      - PGID=1000
-        #      - TZ=Europe/Helsinki
+        #      - TZ=Europe/Paris
         #    volumes:
         #      - ./radarr:/config
         #      - /mnt/storage/video/Films/:/movies
@@ -110,7 +111,10 @@ services:
     image: lscr.io/linuxserver/syncthing:latest
     container_name: syncthing
     hostname: drmanhattan #optional
-    environment: *common-environment
+    environment:
+      - PUID=1000
+      - PGID=1000
+      - TZ=Europe/Paris
     volumes:
       - ./syncthing:/config
       - /mnt/storage/music/Florent:/music
@@ -129,11 +133,13 @@ services:
     volumes:
       - lychee-db:/config
     environment:
-      <<: *common-environment
+      - MYSQL_ROOT_PASSWORD=rootpassword
-      MYSQL_ROOT_PASSWORD: rootpassword
+      - MYSQL_DATABASE=lychee
-      MYSQL_DATABASE: lychee
+      - MYSQL_USER=lychee
-      MYSQL_USER: lychee
+      - MYSQL_PASSWORD=dbpassword
-      MYSQL_PASSWORD: dbpassword
+      - PGID=1000
+      - PUID=1000
+      - TZ=Europe/Paris
 
 
   lychee:
@@ -146,12 +152,14 @@ services:
       - lychee-config:/config
       - lychee-pictures:/pictures
     environment:
-      <<: *common-environment
+      - DB_HOST=lychee-db
-      DB_HOST: lychee-db
+      - DB_USERNAME=lychee
-      DB_USERNAME: lychee
+      - DB_PASSWORD=dbpassword
-      DB_PASSWORD: dbpassword
+      - DB_DATABASE=lychee
-      DB_DATABASE: lychee
+      - DB_PORT=3306
-      DB_PORT: 3306
+      - PGID=1000
+      - PUID=1000
+      - TZ=Europe/Paris
 
         # WIP
         #  zotero:
@@ -162,7 +170,7 @@ services:
         #    environment:
         #      - PUID=1000
         #      - PGID=1000
-        #      - TZ=Europe/Helsinki
+        #      - TZ=Europe/Paris
         #      - USERNAME=user
         #      - PASSWORD=passwd
         #    volumes:
@@ -180,7 +188,10 @@ services:
     container_name: taskserver
     hostname: dm.guiotte.fr
     restart: always
-    environment: *common-environment
+    environment:
+      - PUID=1000
+      - PGID=1000
+      - TZ=Europe/Paris
     env_file:
       - taskserver/taskserver.env
     ports:
@@ -195,7 +206,10 @@ services:
     build: slides-notes
     container_name: slides-notes
     restart: always
-    environment: *common-environment
+    environment:
+      - PUID=1000
+      - PGID=1000
+      - TZ=Europe/Paris
     volumes:
       - ./slides-notes/slides:/app/slides