Updates to Typo3 frankenphp

.github/workflows/release.yaml

@@ -19,8 +19,8 @@ jobs:
           publish-templates: "true"
           base-path-to-templates: "./src"
           generate-docs: "true"
-        #env:
-        #  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Create PR for Documentation
         id: push_image_info

src/typo3/.devcontainer/devcontainer.json

@@ -40,9 +40,9 @@
 			"label": "Mysql Adminer"
 		}
 	},
-	"onCreateCommand": "chmod -c +x ${WORKSPACE_ROOT}/.devcontainer/onCreateCommandScript.sh && ${WORKSPACE_ROOT}/.devcontainer/onCreateCommandScript.sh",
-	"postCreateCommand": "${WORKSPACE_ROOT}/.devcontainer/postCreateCommandScript.sh",
-	"postAttachCommand": "cd ${WORKSPACE_ROOT} && .devcontainer/docker/frankenphp/server.sh && git pull && exit 0",
+	"onCreateCommand": "chmod -c +x .devcontainer/onCreateCommandScript.sh && .devcontainer/onCreateCommandScript.sh",
+	"postCreateCommand": ".devcontainer/postCreateCommandScript.sh",
+	"postAttachCommand": ".devcontainer/postAttachCommandScript.sh",
 	"customizations": {
 		"vscode": {
 			"settings": {

src/typo3/.devcontainer/docker/docker-compose.backend.yaml

@@ -57,7 +57,7 @@ services:
       interval: 20s
       timeout: 5s
       retries: 5
-      #start_period: 10s
+      start_period: 30s
       #start_interval: 5s
   adminer:
     image: adminer:latest

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

@@ -23,10 +23,10 @@ mkdir -vp var/log/
 
 if [ "${TYPO3_INSTALL_DB_DRIVER}" == "mysqli" ]; then
   echo "Using MySQL/MariaDB as database - resetting database"
-    # Drop all database tables
-    mysql -h${TYPO3_INSTALL_DB_HOST} -P${TYPO3_INSTALL_DB_PORT} -u${TYPO3_INSTALL_DB_USER} -p${TYPO3_INSTALL_DB_PASSWORD} --silent --skip-column-names -e "SHOW TABLES" ${TYPO3_INSTALL_DB_DBNAME} |
-        xargs -L1 -I% echo 'SET FOREIGN_KEY_CHECKS = 0; DROP TABLE %; SET FOREIGN_KEY_CHECKS = 1;' |
-        mysql -h${TYPO3_INSTALL_DB_HOST} -P${TYPO3_INSTALL_DB_PORT} -u${TYPO3_INSTALL_DB_USER} -p${TYPO3_INSTALL_DB_PASSWORD} -v ${TYPO3_INSTALL_DB_DBNAME}
+  # Drop all database tables
+  mysql -h${TYPO3_INSTALL_DB_HOST} -P${TYPO3_INSTALL_DB_PORT} -u${TYPO3_INSTALL_DB_USER} -p${TYPO3_INSTALL_DB_PASSWORD} --silent --skip-column-names -e "SHOW TABLES" ${TYPO3_INSTALL_DB_DBNAME} | \
+      xargs -I% echo 'SET FOREIGN_KEY_CHECKS = 0; DROP TABLE %; SET FOREIGN_KEY_CHECKS = 1;' | \
+      mysql -h${TYPO3_INSTALL_DB_HOST} -P${TYPO3_INSTALL_DB_PORT} -u${TYPO3_INSTALL_DB_USER} -p${TYPO3_INSTALL_DB_PASSWORD} -v ${TYPO3_INSTALL_DB_DBNAME}
 
     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
 fi

src/typo3/.devcontainer/postAttachCommandScript.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+set -eu
+
+# post start script
+echo "BEGIN: postAttachCommandScript.sh"
+.devcontainer/docker/frankenphp/server.sh
+echo "END: postAttachCommandScript.sh"

src/typo3/devcontainer-template.json

@@ -1,6 +1,6 @@
 {
     "id": "typo3",
-    "version": "0.0.1",
+    "version": "0.0.2",
     "name": "Typo3 ",
     "description": "TYPO3 development container template",
     "documentationURL": "https://github.com/thucke/devcontainer-templates/tree/main/src/typo3",

test/typo3/test.sh

@@ -4,8 +4,8 @@ source test-utils.sh
 
 # Template specific tests
 check "distro" lsb_release -c
-check "Testing docker command existence" [[ `which docker` ]]
-check "Testing git command existence" [[ `which git` ]]
+check "Testing docker command existence" test -n  $(which docker)
+check "Testing git command existence" test -n  $(which git)
 
 # Report result
-reportResults
+reportResults