diff --git a/docker/.env b/docker/.env index 40b752e095652f103dd2b49dc0611c85d9e60c69..edab665ef52ae19c007f68f55b3744c7be96f2bf 100644 --- a/docker/.env +++ b/docker/.env @@ -1,6 +1,6 @@ # ====================================================================== # -# GENERATED BY docker/init.sh - template: ./templates/dot_env - e2cde05722688ff85d3a93e9cd55787e +# GENERATED BY init.sh - template: ./templates/dot_env - e2cde05722688ff85d3a93e9cd55787e # values to be used in docker-composer.yml # # ====================================================================== diff --git a/docker/containers/web-server/Dockerfile b/docker/containers/web-server/Dockerfile index fd26aeda16c4457c779f8ed0bcc8c64d5459e944..e5b01f06ca41f4d70f6821cdd5e2021e1210a569 100644 --- a/docker/containers/web-server/Dockerfile +++ b/docker/containers/web-server/Dockerfile @@ -1,5 +1,5 @@ # -# GENERATED BY docker/init.sh - template: ./templates/web-server-Dockerfile - 42dce773c83597a7d05af398bdd66d15 +# GENERATED BY init.sh - template: ./templates/web-server-Dockerfile - 42dce773c83597a7d05af398bdd66d15 # FROM php:8.1-apache diff --git a/docker/containers/web-server/apache/sites-enabled/vhost_app.conf b/docker/containers/web-server/apache/sites-enabled/vhost_app.conf index c223a7617906a709c511b1192b28d61fb0437c6c..872493645c22d783c78e8ae433ce97580abacc5d 100644 --- a/docker/containers/web-server/apache/sites-enabled/vhost_app.conf +++ b/docker/containers/web-server/apache/sites-enabled/vhost_app.conf @@ -1,5 +1,5 @@ # -# GENERATED BY docker/init.sh - template: ./templates/vhost_app.conf - 9a9cf79de5a3584c0cef6cb79c339c25 +# GENERATED BY init.sh - template: ./templates/vhost_app.conf - 9a9cf79de5a3584c0cef6cb79c339c25 # diff --git a/docker/containers/web-server/php/extra-php-config.ini b/docker/containers/web-server/php/extra-php-config.ini index 674b4dd6106afe25c6fb1074b64d9b7d77e91256..5cc3af6d4826463f008b05762f398fc227f58b64 100644 --- a/docker/containers/web-server/php/extra-php-config.ini +++ b/docker/containers/web-server/php/extra-php-config.ini @@ -1,5 +1,5 @@ ; -; GENERATED BY docker/init.sh - template: ./templates/extra-php-config.ini - 80c23edaf568e2c36b9926fe2339e481 +; GENERATED BY init.sh - template: ./templates/extra-php-config.ini - 80c23edaf568e2c36b9926fe2339e481 ; [PHP] diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 2b983d57879e787de6170039f05c3bd7b3fee8db..c01edc7832b3f720dfce00c51e8d49ff60cc7fdc 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -1,5 +1,5 @@ # -# GENERATED BY docker/init.sh - template: ./templates/docker-compose.yml - 97c88229bd2b5099544c013052b8d9c3 +# GENERATED BY init.sh - template: ./templates/docker-compose.yml - 97c88229bd2b5099544c013052b8d9c3 # # ====================================================================== # diff --git a/docker/init.sh b/docker/init.sh index 760d6005bed0c4e5233d585b06d3692e583603bd..fdb14f5c1482639d15932240a30e6e4b32f7d122 100755 --- a/docker/init.sh +++ b/docker/init.sh @@ -4,8 +4,9 @@ # DOCKER PHP DEV ENVIRONMENT :: INIT # # ---------------------------------------------------------------------- -# 2021-11-nn <axel.hahn@iml.unibe.ch> -# 2022-07-19 <axel.hahn@iml.unibe.ch> support multiple dirs for setfacl +# 2021-11-nn v1.0 <axel.hahn@iml.unibe.ch> +# 2022-07-19 v1.1 <axel.hahn@iml.unibe.ch> support multiple dirs for setfacl +# 2022-07-19 v1.2 <www.axel-hahn.de> use docker-compose -p "$APP_NAME" # ====================================================================== cd $( dirname $0 ) @@ -14,6 +15,8 @@ cd $( dirname $0 ) # git@git-repo.iml.unibe.ch:iml-open-source/docker-php-starterkit.git selfgitrepo="docker-php-starterkit.git" +_version="1.2" + # ---------------------------------------------------------------------- # FUNCTIONS # ---------------------------------------------------------------------- @@ -233,7 +236,7 @@ action=$1 while true; do echo - echo -e "\e[32m===== INITIALIZER FOR APP [$APP_NAME] ===== \e[0m" + echo -e "\e[32m===== INITIALIZER FOR DOCKER APP [$APP_NAME] v$_version ===== \e[0m\n\r" if [ -z "$action" ]; then @@ -282,7 +285,7 @@ while true; do _wait ;; u) - if docker-compose --verbose up -d --remove-orphans --build; then + if docker-compose -p "$APP_NAME" --verbose up -d --remove-orphans --build; then # test ! -z "${APP_ONSTARTUP}" && sleep 2 && docker exec -it appmonitor-server /bin/bash -c "${APP_ONSTARTUP}" echo "In a web browser:" echo " $frontendurl"