From 80c6710afcc3aecc5ad64c18379582c6f753e0b6 Mon Sep 17 00:00:00 2001
From: hahn <axel.hahn@iml.unibe.ch>
Date: Mon, 5 Dec 2022 10:41:51 +0100
Subject: [PATCH] update docker files
---
docker/.env | 2 +-
docker/containers/web-server/Dockerfile | 2 +-
.../web-server/apache/sites-enabled/vhost_app.conf | 2 +-
docker/containers/web-server/php/extra-php-config.ini | 2 +-
docker/docker-compose.yml | 2 +-
docker/init.sh | 11 +++++++----
6 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/docker/.env b/docker/.env
index 40b752e0..edab665e 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 fd26aeda..e5b01f06 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 c223a761..87249364 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 674b4dd6..5cc3af6d 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 2b983d57..c01edc78 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 760d6005..fdb14f5c 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"
--
GitLab