INFRA-107 – check in local changes used for in-browser install

app/config/local.php

@@ -0,0 +1,10 @@
+<?php
+$parameters = array (
+    'db_driver' => 'pdo_mysql',
+    'install_source' => 'Docker',
+    'db_port' => '3306',
+    'db_host' => 'mauticdb',
+    'db_name' => 'mautic',
+    'db_user' => 'root',
+    'db_password' => 'mysecret',
+);

docker-compose.yml

@@ -22,6 +22,7 @@ services:
     build:
       context: .
       dockerfile: Dockerfile
+    entrypoint: apache2-foreground
     container_name: mautic
     links:
       - mauticdb
@@ -30,14 +31,11 @@ services:
     ports:
       - '8080:80'
     environment:
-      - [email protected]
-      - MAUTIC_ADMIN_PASSWORD=localPass123
       - MAUTIC_DB_HOST=mauticdb:3306 # makeconfig.php sets the required port but only when it's explicit after : here
       - MAUTIC_DB_USER=root
       - MAUTIC_DB_PASSWORD=mysecret
       - MAUTIC_DB_NAME=mautic
       - MAUTIC_ENV=dev
-      - MAUTIC_INSTALL_FORCE=true # Force auto-install despite URL being non-SSL
       - MAUTIC_RUN_CRON_JOBS=true
       - MAUTIC_URL=http://localhost:8080
     networks:

secrets_entrypoint.sh

@@ -12,10 +12,6 @@
 ## Load the S3 secrets file contents into the environment variables
 #export $(aws s3 cp s3://${SECRETS_BUCKET_NAME}/secrets - | grep -v '^#' | xargs)
 
-# Call our copy of the Mautic entrypoint script then the e.g. start Apache CMD
-# (argument to entrypoint).
-# The one change in our entrypoint vs. that upstream as of 13/4/23 is the addition
-# of a modified index.php which we copy at startup, so that we can change it after
-# the normal auto install process completes. The purpose of that modified index.php
-# is to fix infinite redirect loops when using an ALB with SSL.
-/entrypoint.sh "$@"
+echo "Starting Apache..."
+# No args for now. Our base php:8.0 already turns on the `mautic` vhost.
+apache2-foreground