create new docker setup

.env.dist

@@ -1,2 +1,13 @@
+ENV=dev
 USERMAP_UID=1000
 USERMAP_GID=984
+MYSQL_USER=dev
+MYSQL_PASSWORD=dev
+MYSQL_ROOT_PASSWORD=root
+MYSQL_DATABASE=db
+MYSQL_PUBLIC_PORT=3306
+PHP_VERSION=8.2
+MARIADB_VERSION=latest
+APACHE_VERSION=2.4-alpine
+HTTP_PORT=80
+SHTTP_PORT=443

.gitignore

@@ -2,7 +2,7 @@
 /tests/behat.yml
 /tests/.phpunit.result.cache
 /vendor/
-/node_modules/
+/client/node_modules/
 /public/assets/*
 *.cache
 *.phar

config/autoload/database.global.php.dist

@@ -2,10 +2,10 @@
 
 return [
     'database' => [
-        'host' => 'hackathon-db',
+        'host' => 'mariadb',
         'port' => '3306',
-        'user' => 'db',
-        'password' => 'db',
+        'user' => 'dev',
+        'password' => 'dev',
         'dbname' => 'db',
         'error' => PDO::ERRMODE_EXCEPTION,
     ]

docker-compose.yml

@@ -1,31 +1,40 @@
-version: "3"
+version: "3.8"
 
 services:
-
-  webserver:
-    build: ./docker/webserver
-    user: "${USERMAP_UID}:${USERMAP_GID}"
-    container_name: hackathon_backend
+  apache:
+    image: httpd:alpine
+    container_name: apache
     ports:
-      - "80:80"
+      - "${HTTP_PORT:-80}:80"
+      - "${SHTTP_PORT:-443}:443"
+    volumes:
+      - ./:/var/www/html
+      - ./docker/httpd.conf:/usr/local/apache2/conf/httpd.conf
+
+  php:
+    container_name: php
+    user: "${USERMAP_UID:-1000}:${USERMAP_GID:-1000}"
+    build:
+      context: ./docker/php
+      args:
+        PHP_VERSION: ${PHP_VERSION:-8.2}
+        ENV: ${ENV:-production}
     volumes:
       - ./:/var/www/html
-      - ./docker/xdebug.ini:/usr/local/etc/php/conf.d/xdebug.ini
-      - ./docker/php.ini:/usr/local/etc/php/conf.d/extra.ini
-      - ./.phpunit.cache/code-coverage:/opt/phpstorm-coverage
+      - ./docker/php/php-ini-overrides.ini:/usr/local/etc/php/conf.d/extra.ini
 
-  hackathon-db:
-    image: mariadb:10.9
-    container_name: hackathon_mariadb
+  database:
+    image: mariadb:${MARIADB_VERSION:-latest}
+    container_name: mariadb
     ports:
-      - "3306:3306"
+      - "${MYSQL_PUBLIC_PORT:-3306}:3306"
     environment:
-      MYSQL_ROOT_PASSWORD: root
-      MYSQL_DATABASE: db
-      MYSQL_USER: db
-      MYSQL_PASSWORD: db
+      MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD:-root}
+      MYSQL_DATABASE: ${MYSQL_DATABASE:-db}
+      MYSQL_USER: ${MYSQL_USER:-dev}
+      MYSQL_PASSWORD: ${MYSQL_PASSWORD:-dev}
     volumes:
-      - hackathon-db-data:/var/lib/mysql
+      - db:/var/lib/mysql
 
   mailhog:
     image: mailhog/mailhog
@@ -36,4 +45,4 @@ services:
       - "8025:8025" # web ui
 
 volumes:
-  hackathon-db-data:
+  db: