diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 7558312..aca604c 100644 --- a/.github/workflows/release.yaml +++ b/.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 diff --git a/src/typo3/.devcontainer/devcontainer.json b/src/typo3/.devcontainer/devcontainer.json index c52040e..955df4b 100644 --- a/src/typo3/.devcontainer/devcontainer.json +++ b/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": { diff --git a/src/typo3/.devcontainer/docker/apache/preStop.sh b/src/typo3/.devcontainer/docker/apache/preStop.sh old mode 100644 new mode 100755 diff --git a/src/typo3/.devcontainer/docker/docker-compose.backend.yaml b/src/typo3/.devcontainer/docker/docker-compose.backend.yaml index d8bf08b..bd87ed1 100644 --- a/src/typo3/.devcontainer/docker/docker-compose.backend.yaml +++ b/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 diff --git a/src/typo3/.devcontainer/docker/frankenphp/server.sh b/src/typo3/.devcontainer/docker/frankenphp/server.sh old mode 100644 new mode 100755 diff --git a/src/typo3/.devcontainer/docker/igniteEnvironment.sh b/src/typo3/.devcontainer/docker/igniteEnvironment.sh old mode 100644 new mode 100755 index c0c9af5..ecd6550 --- a/src/typo3/.devcontainer/docker/igniteEnvironment.sh +++ b/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 diff --git a/src/typo3/.devcontainer/docker/initializeTYPO3.sh b/src/typo3/.devcontainer/docker/initializeTYPO3.sh old mode 100644 new mode 100755 diff --git a/src/typo3/.devcontainer/docker/parseDotEnv.sh b/src/typo3/.devcontainer/docker/parseDotEnv.sh old mode 100644 new mode 100755 diff --git a/src/typo3/.devcontainer/docker/php/php-fpm-healthcheck.sh b/src/typo3/.devcontainer/docker/php/php-fpm-healthcheck.sh old mode 100644 new mode 100755 diff --git a/src/typo3/.devcontainer/onCreateCommandScript.sh b/src/typo3/.devcontainer/onCreateCommandScript.sh old mode 100644 new mode 100755 diff --git a/src/typo3/.devcontainer/postAttachCommandScript.sh b/src/typo3/.devcontainer/postAttachCommandScript.sh new file mode 100755 index 0000000..ea976e6 --- /dev/null +++ b/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" diff --git a/src/typo3/.devcontainer/postCreateCommandScript.sh b/src/typo3/.devcontainer/postCreateCommandScript.sh old mode 100644 new mode 100755 diff --git a/src/typo3/devcontainer-template.json b/src/typo3/devcontainer-template.json index 8a23712..bc1f782 100644 --- a/src/typo3/devcontainer-template.json +++ b/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", diff --git a/test/typo3/test.sh b/test/typo3/test.sh index 965b286..3a61d95 100644 --- a/test/typo3/test.sh +++ b/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 \ No newline at end of file