Merge pull request 'feat(Directus): Ajout d'une variable pour la configuration du propriétaire' (#89) from directus into main

Reviewed-on: #89

directus/docker-compose.yml

@@ -19,6 +19,7 @@ services:
       SECRET: ${DIRECTUS_SECRET:?err}
       TELEMETRY: false
       ACCEPT_TERMS: ${DIRECTUS_ACCEPT_TERMS:-true}
+      PROJECT_OWNER: ${DIRECTUS_PROJECT_OWNER:?err}
 
       ADMIN_EMAIL: ${DIRECTUS_ADMIN_EMAIL:?err}
       ADMIN_PASSWORD: ${DIRECTUS_ADMIN_PASSWORD:?err}

mariadb/.env

@@ -0,0 +1,18 @@
+########
+# DOCKER
+
+#DOCKER_CONTEXT=
+#DOCKER_HOST=
+SERVICES_DIR=..
+COMPOSE_FILE=${SERVICES_DIR}/mariadb/docker-compose.yml:${SERVICES_DIR}/mariadb/docker-compose.local.yml
+#COMPOSE_PROJECT_NAME=
+
+## MARIADB
+
+#MARIADB_VOLUME_NAME=
+#MARIADB_CONTAINER_NAME=
+#MARIADB_IMAGE=
+MARIADB_ROOT_PASSWORD=password-example
+MARIADB_PASSWORD=password-example
+MARIADB_DATABASE=db
+MARIADB_USER=user

mariadb/README.md

@@ -0,0 +1,15 @@
+# Mariadb
+
+> Mariadb est une base de données SQL.
+
+## Liens
+
+- [Site Officiel][site]
+- [Documentation][documentation]
+- [Code source][source]
+- [Docker Hub][dockerhub]
+
+[site]: https://mariadb.org/
+[source]: https://github.com/MariaDB/
+[documentation]: https://mariadb.org/documentation/
+[dockerhub]: https://hub.docker.com/_/mariadb/

mariadb/docker-compose.local.yml

@@ -0,0 +1,6 @@
+---
+
+services:
+  mariadb:
+    ports:
+      - ${LOCAL_PORT:-3306}:3306

mariadb/docker-compose.yml

@@ -0,0 +1,20 @@
+---
+
+services:
+  mariadb:
+    container_name: ${MARIADB_CONTAINER_NAME:-mariadb}
+    image: ${MARIADB_IMAGE:-mariadb:lts}
+    restart: always
+    volumes:
+      - mariadb:/var/lib/mysql
+      - /etc/timezone:/etc/timezone:ro
+      - /etc/localtime:/etc/localtime:ro
+    environment:
+      - MARIADB_DATABASE=${MARIADB_DATABASE:?err}
+      - MARIADB_PASSWORD=${MARIADB_PASSWORD:?err}
+      - MARIADB_ROOT_PASSWORD=${MARIADB_ROOT_PASSWORD:?err}
+      - MARIADB_USER=${MARIADB_USER:?err}
+
+volumes:
+  mariadb:
+    name: ${MARIADB_VOLUME_NAME:-mariadb}

matomo/.env

@@ -4,7 +4,7 @@
 #DOCKER_CONTEXT=
 #DOCKER_HOST=
 SERVICES_DIR=..
-COMPOSE_FILE=${SERVICES_DIR}/matomo/docker-compose.yml:${SERVICES_DIR}/matomo/docker-compose.local.yml
+COMPOSE_FILE=${SERVICES_DIR}/mariadb/docker-compose.yml:${SERVICES_DIR}/matomo/docker-compose.mariadb.yml:${SERVICES_DIR}/matomo/docker-compose.yml:${SERVICES_DIR}/matomo/docker-compose.local.yml
 #COMPOSE_PROJECT_NAME=
 
 ## APP
@@ -13,6 +13,7 @@ MATOMO_DOMAIN=localhost
 #MATOMO_CONTAINER_NAME=matomo
 #MATOMO_VOLUME_NAME=matomo
 #MATOMO_IMAGE=matomo:4.1.1-apache
+#MATOMO_DATABASE_TABLES_PREFIX:matomo_
 
 ## MARIADB
 
@@ -21,6 +22,8 @@ MATOMO_DOMAIN=localhost
 #MARIADB_IMAGE=
 MARIADB_ROOT_PASSWORD=password-example
 MARIADB_PASSWORD=password-example
+MARIADB_DATABASE=matomo
+MARIADB_USER=matomo
 
 ## TRAEFIK
 

matomo/docker-compose.mariadb.yml

@@ -0,0 +1,9 @@
+---
+
+services:
+  mariadb:
+    command: --max-allowed-packet=64MB
+    environment:
+      - MARIADB_AUTO_UPGRADE=1
+      - MARIADB_DISABLE_UPGRADE_BACKUP=1
+      - MARIADB_INITDB_SKIP_TZINFO=1

matomo/docker-compose.yml

@@ -1,24 +1,6 @@
 ---
 
 services:
-  db:
-    container_name: ${MARIADB_CONTAINER_NAME:-mariadb}
-    image: ${MARIADB_IMAGE:-mariadb:lts}
-    command: --max-allowed-packet=64MB
-    restart: always
-    volumes:
-      - db:/var/lib/mysql:Z
-      - /etc/timezone:/etc/timezone:ro
-      - /etc/localtime:/etc/localtime:ro
-    environment:
-      - MARIADB_AUTO_UPGRADE=1
-      - MARIADB_DATABASE=matomo
-      - MARIADB_DISABLE_UPGRADE_BACKUP=1
-      - MARIADB_INITDB_SKIP_TZINFO=1
-      - MARIADB_PASSWORD=${MARIADB_PASSWORD:?err}
-      - MARIADB_ROOT_PASSWORD=${MARIADB_ROOT_PASSWORD:?err}
-      - MARIADB_USER=matomo
-
   matomo:
     container_name: ${MATOMO_CONTAINER_NAME:-matomo}
     image: ${MATOMO_IMAGE:-matomo:4.1.1-apache}
@@ -26,20 +8,19 @@ services:
     volumes:
 #     - ./config:/var/www/html/config:z
 #     - ./logs:/var/www/html/logs:z
-      - matomo:/var/www/html:z
+      - matomo:/var/www/html
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
     depends_on:
-      - db
+      - mariadb
     environment:
       - MATOMO_DATABASE_ADAPTER=mysql
-      - MATOMO_DATABASE_DBNAME=matomo
-      - MATOMO_DATABASE_HOST=db
+      - MATOMO_DATABASE_DBNAME=${MARIADB_DATABASE:?err}
+      - MATOMO_DATABASE_HOST=mariadb
       - MATOMO_DATABASE_PASSWORD=${MARIADB_PASSWORD:?err}
-      - MATOMO_DATABASE_TABLES_PREFIX=matomo_
-      - MATOMO_DATABASE_USERNAME=matomo
+      - MATOMO_DATABASE_TABLES_PREFIX=${MATOMO_DATABASE_TABLES_PREFIX:-matomo_}
+      - MATOMO_DATABASE_USERNAME=${MARIADB_USER:?err}
 
 volumes:
-  db:
   matomo:
     name: ${MATOMO_VOLUME_NAME:-matomo}