Typo3 frankenphp

src/typo3/.devcontainer/README.md

@@ -12,19 +12,19 @@ Homepage: [Github](https://github.com/thucke/devcontainer-templates/tree/main/sr
   * Git-Repository: checked out to `${WORKSPACE_ROOT}`
 
 ## Re-Initialize TYPO3 environment
-  
+
   If you need to get a clean TYPO3 environment based upon your configuration you may spawn a terminal window and execute
-  
+
    `${WORKSPACE_ROOT}/.devcontainer/docker/igniteEnvironment.sh`
 
 ## Update devcontainer template
 
-If you want to update the devcontainer configuration e.g. after a new template version has been published you can make use of the [Dev Container CLI](https://github.com/devcontainers/cli) with the following command:
+If you want to update the devcontainer configuration e.g. after a new template version has been published you can make use of the [Dev Container CLI](https://github.com/devcontainers/cli) with the following command (**make sure you're in the root directory of your repository**):
 
-    devcontainer templates apply --template-id ghcr.io/thucke/devcontainer-templates/typo3  --template-args "{\"database\": \"mysql\"}" -w ${WORKSPACE_ROOT}. 
+    devcontainer templates apply --template-id ghcr.io/thucke/devcontainer-templates/typo3  --template-args "{\"database\": \"mysql\"}" -w .
 
 ## TYPO3 environment configuration
 
   You may modify the file `${WORKSPACE_ROOT}/.devcontainer/.env` with caution if you want to adjust some core TYPO3 settings. After this file has been modified it is recommended to rebuild the whole devcontainer.
 
-  **In this file you can find the password of the database root as well as the TYPO3 backend user credentials.**
+  **In this file you can find the password of the database root as well as the TYPO3 backend user credentials.**

src/typo3/.devcontainer/docker/igniteEnvironment.sh

@@ -1,60 +1,50 @@
 #!/bin/bash
-set -eu
-
-# post start script
-echo "BEGIN: initializeTYPO3.sh"
-
-echo "initializeTYPO3: Checking if site already has been initialized"
-if test ! -d .build/vendor; then
-  echo "initializeTYPO3: Initialize TYPO3"
-  composer config allow-plugins.helhum/dotenv-connector true
-  composer require --no-scripts --no-interaction --dev "helhum/dotenv-connector"
-  composer require --no-scripts --no-interaction --dev "helhum/typo3-console"
-  composer config bin-dir .build/bin
-  composer config vendor-dir .build/vendor
-  composer config extra.typo3/cms.web-dir .build/public
-  composer config extra.helhum/dotenv-connector.env-file .devcontainer/docker/typo3/TYPO3.env
-  composer install
-  # Add .build/bin to PATH
-  [[ ":$PATH:" != *":${WORKSPACE_ROOT}/.build/bin:"* ]] && export PATH="${WORKSPACE_ROOT}/.build/bin:${PATH}"
-fi
+#
+# !!!! IMPORTANT: WORKSPACE_ROOT has to be set before sourcing this script
+echo "BEGIN: igniteEnvironment.sh"
 
 typo3_major_version=$(typo3 -V|grep "TYPO3 CMS"|perl -n -e '/\ ([\d]+)/ && print $1')
 echo "initializeTYPO3: Running on TYPO3 major version ${typo3_major_version}"
 
 echo "initializeTYPO3: DB compare"
 typo3 database:updateschema --no-interaction --no-ansi || true
 
-echo "initializeTYPO3: Update reference index"
-typo3 referenceindex:update --no-interaction --no-ansi || true
+echo "igniteEnvironment.sh: Reset environment"
+rm -rfv config .build/bin .build/public .build/vendor var
+mkdir -vp .build/public var/log/ var/lib
+if [ "${DB_SERVER_TYPE}" == "sqlite" ]; then
+  rm -fv ${SQLITE_DBFILE_PATH}
+  mkdir -vp $(dirname ${SQLITE_DBFILE_PATH})
+else
+  echo "igniteEnvironment.sh: No need to create SqLite datafile directory"
+fi
 
 #echo "initializeTYPO3: Create new backend user"
 #$typo3_cli backend:createadmin ${TYPO3_INSTALL_ADMIN_USER} ${TYPO3_INSTALL_ADMIN_PASSWORD} --no-interaction --no-ansi || true
 
-if [ ! -f config/system/additional.php ]; then
-    echo "initializeTYPO3.sh: Add additional.php if not exists"
-    cp .devcontainer/docker/typo3/additional.php config/system/additional.php
-else
-    echo "initializeTYPO3.sh: additional.php already exists - skipping"
+    mysql -h${TYPO3_INSTALL_DB_HOST} -P${TYPO3_INSTALL_DB_PORT} -u${TYPO3_INSTALL_DB_USER} -p${TYPO3_INSTALL_DB_PASSWORD} --init-command='USE '${TYPO3_INSTALL_DB_DBNAME} < .devcontainer/docker/db/initdb/2_create_procedure.sql
+elif [ "${TYPO3_INSTALL_DB_DRIVER}" == "pdo_sqlite" ] && [ -f ${SQLITE_DBFILE_PATH} ]; then
+  echo "Using SQLite as database - resetting database"
+  rm -fv ${SQLITE_DBFILE_PATH}
 fi
 
-# take care of file ownership esp. to support cross container functionality
-echo "initializeTYPO3: Update file and directory ownership"
-chown -R ${DEVCONTAINER_SERVICE_NAME}:${DEVCONTAINER_SERVICE_NAME} config .build var
-chgrp ${DEVCONTAINER_SERVICE_NAME} ${WORKSPACE_ROOT}
-
-# needed as directory check moans about wrong permissions
-echo "initializeTYPO3: Update file permissions"
-chmod -R 2770 .build config var
-
-echo "initializeTYPO3.sh: Running composer up"
-composer up
-
-if [ "${TYPO3_INSTALL_DB_DRIVER}" == "mysqli" ]; then
-    echo "initializeTYPO3.sh: Fix TYPO3 image references"
-    mysql -h127.0.0.1 -P3306 -u${TYPO3_INSTALL_DB_USER} -p${TYPO3_INSTALL_DB_PASSWORD} -e 'use '${TYPO3_INSTALL_DB_DBNAME}'; call fixImgInTtContent();'
+if [ -f ${WORKSPACE_ROOT}/composer.json ]; then
+  echo "initializeTYPO3.sh: Found composer.json - running initializeTYPO3.sh"
+  chmod +x .devcontainer/docker/initializeTYPO3.sh
+  .devcontainer/docker/initializeTYPO3.sh
 else
-    echo "initializeTYPO3.sh: Fix TYPO3 image references - skipping as database driver is not mysqli"
+  echo "No composer.json found - skipping initializeTYPO3.sh and composer up"
+fi
+
+if [[ "${COMPOSE_PROFILES}" =~ "php-fpm" ]]; then
+    echo "initializeTYPO3.sh: Checking for running php-fpm"
+    .devcontainer/php-fpm/server.sh restart
+elif [[ "${COMPOSE_PROFILES}" =~ "apache" ]]; then
+    echo "initializeTYPO3.sh: Restarting Apache"
+    .devcontainer/php-fpm/server.sh
+elif [[ "${COMPOSE_PROFILES}" =~ "frankenphp" ]]; then
+    echo "initializeTYPO3.sh: Restarting FrankenPHP"
+    .devcontainer/docker/frankenphp/server.sh restart
 fi
 
 echo "END: initializeTYPO3.sh"

src/typo3/devcontainer-template.json

@@ -1,6 +1,6 @@
 {
     "id": "typo3",
-    "version": "0.3.2",
+    "version": "0.3.3",
     "name": "Typo3",
     "description": "A template to support remote development with TYPO3.",
     "documentationURL": "https://github.com/thucke/devcontainer-templates/tree/main/src/typo3",