Summary: bürgerliste-reichenhall integriert

docker-compose.yml

@@ -1,7 +1,10 @@
-# 	$Id: docker-compose.yml,v 1.5 2022/06/05 09:29:36 springm Exp springm $
-#       $Revision: 1.5 $
-#       $Date: 2022/06/05 09:29:36 $
+# 	$Id: docker-compose.yml,v 1.6 2022/06/22 11:58:38 springm Exp springm $
+#       $Revision: 1.6 $
+#       $Date: 2022/06/22 11:58:38 $
 #       $Log: docker-compose.yml,v $
+#       Revision 1.6  2022/06/22 11:58:38  springm
+#       Summary: Running version before integrating Matomo
+#
 #       Revision 1.5  2022/06/05 09:29:36  springm
 #       Summary: DISABLE_WP_CRON eingefügt
 #
@@ -24,17 +27,19 @@ version: '3.8'
 services:
   nginx:
     image: nginx:alpine
-    container_name: wp-nginx
+    container_name: wp-matomo-nginx
     restart: always
     depends_on:
-      - wordpress
+      - wordpress-fpm
+      - matomo-fpm
     expose:
       - 80
       - 443
     volumes:
-      - ./nginx/conf:/etc/nginx/conf.d
-      - ./nginx/logs:/var/log/nginx
+      - ./conf:/etc/nginx/conf.d
+      - ./logs:/var/log/nginx
       - ./wordpress:/var/www/html
+      - ./matomo:/var/www/matomo
     networks:
       - wordpress
       - proxy
@@ -51,10 +56,10 @@ services:
       - traefik.http.routers.wordpress-secure.entrypoints=websecure
       - traefik.http.routers.wordpress-secure.tls.certresolver=cloudflare
 
-  wordpress:
+  wp-fpm:
     image: wordpress:php8.0-fpm-alpine
     restart: always
-    container_name: wp-wordpress
+    container_name: wp-fpm
     depends_on: 
       - mariadb
       - redis
@@ -103,6 +108,26 @@ services:
     networks:
       - wordpress
       - proxy
+  
+  matomo-fpm:
+    image: matomo:fpm-alpine
+    #image: wordpress:php8.0-fpm-alpine
+    container_name: matomo-fpm
+    restart: unless-stopped
+    depends_on: 
+      - mariadb
+    volumes:
+      - ./matomo:/var/www/matomo
+    environment:
+      - MATOMO_DATABASE_HOST=mariadb
+      - MATOMO_DATABASE_ADAPTER=mariadb
+      - MATOMO_DATABASE_TABLES_PREFIX=${MATOMO_DATABASE_TABLES_PREFIX}
+      - MATOMO_DATABASE_USERNAME=${MYSQL_USER}
+      - MATOMO_DATABASE_PASSWORD=${MYSQL_PASSWORD}
+      - MATOMO_DATABASE_DBNAME=${MYSQL_DATABASE}
+    networks:
+      - wordpress
+      - proxy
 
   mariadb:
     image: mariadb:latest
@@ -114,11 +139,14 @@ services:
       MYSQL_DATABASE: ${WP_DB_NAME}
       MYSQL_USER: ${WP_DB_USER}
       MYSQL_PASSWORD: ${WP_DB_PASSWORD}
-      MYSQL_RANDOM_ROOT_PASSWORD: '1'
+      # MYSQL_RANDOM_ROOT_PASSWORD: '1'
     volumes:
       - mariadb:/var/lib/mysql
     networks:
       - wordpress
+    # for resetting the root password
+    # https://gist.github.com/rordi/ab55c92848fd06884172ed22ae88d7df
+    # entrypoint: mysqld_safe --skip-grant-tables --user=mysql
 
   redis:
     image: redis:6.2.7
@@ -139,31 +167,31 @@ services:
     networks:
       - wordpress
 
-  phpmyadmin:
-    image: phpmyadmin/phpmyadmin
-    container_name: phpmyadmin
-    ports:
-      - "${LOCAL_PORT_DB_GUI}:80"
-    restart: on-failure:5
-    # depends_on:
-    #   - database
-    environment:
-      PMA_HOST: "${PMA_HOST}"
-      # PMA_ABSOLUTE_URI: "phpmyadmin.markus-spring.de"
-      # PMA_USER: "${PMA_USER}"
-      # PMA_PASSWORD: "${PMA_PASSWORD}"
-    labels:
-      - "traefik.enable=true"
-      - "traefik.docker.network=proxy"
-      - "traefik.http.routers.phpmyadmin.rule=Host(`phpmyadmin.markus-spring.de`)" #edit domain for host
-      - "traefik.http.routers.phpmyadmin.priority=99"
-      - "traefik.http.routers.phpmyadmin.entrypoints=websecure"
-      - "traefik.http.routers.phpmyadmin.tls=true"
-      - "traefik.http.routers.phpmyadmin.tls.certresolver=cloudflare"
-      - "traefik.http.services.phpmyadmin.loadBalancer.server.port=80"
-    networks:
-      - proxy
-      - wordpress
+  # phpmyadmin:
+  #   image: phpmyadmin/phpmyadmin
+  #   container_name: phpmyadmin
+  #   ports:
+  #     - "${LOCAL_PORT_DB_GUI}:80"
+  #   restart: on-failure:5
+  #   # depends_on:
+  #   #   - database
+  #   environment:
+  #     PMA_HOST: "${PMA_HOST}"
+  #     # PMA_ABSOLUTE_URI: "phpmyadmin.markus-spring.de"
+  #     # PMA_USER: "${PMA_USER}"
+  #     # PMA_PASSWORD: "${PMA_PASSWORD}"
+  #   labels:
+  #     - "traefik.enable=true"
+  #     - "traefik.docker.network=proxy"
+  #     - "traefik.http.routers.phpmyadmin.rule=Host(`phpmyadmin.markus-spring.de`)" #edit domain for host
+  #     - "traefik.http.routers.phpmyadmin.priority=99"
+  #     - "traefik.http.routers.phpmyadmin.entrypoints=websecure"
+  #     - "traefik.http.routers.phpmyadmin.tls=true"
+  #     - "traefik.http.routers.phpmyadmin.tls.certresolver=cloudflare"
+  #     - "traefik.http.services.phpmyadmin.loadBalancer.server.port=80"
+  #   networks:
+  #     - proxy
+  #     - wordpress
       
 volumes:
   redis: