fixed warning in docker compose for env variables

This commit is contained in:
asus
2023-09-12 09:39:12 +02:00
parent 0b78df0d5d
commit 0c8d52ca2f
3 changed files with 12 additions and 12 deletions

View File

@@ -28,10 +28,10 @@ COMPOSE = ./srcs/docker-compose.yml
# then expend the home path # then expend the home path
# then expend the pwd path # then expend the pwd path
# and finally remove the leading "EXPEND_" word # and finally remove the leading "EXPEND_" word
EXPENDED_ENV_VAR := $(shell grep "^EXPEND_" ./srcs/.env) EXPENDED_ENV_VAR := $(shell grep "^#EXPEND_" ./srcs/.env)
EXPENDED_ENV_VAR := $(subst $$HOME_PATH,$(HOME),$(EXPENDED_ENV_VAR)) EXPENDED_ENV_VAR := $(subst $$HOME_PATH,$(HOME),$(EXPENDED_ENV_VAR))
EXPENDED_ENV_VAR := $(subst $$PWD_PATH,$(shell pwd),$(EXPENDED_ENV_VAR)) EXPENDED_ENV_VAR := $(subst $$PWD_PATH,$(shell pwd),$(EXPENDED_ENV_VAR))
EXPENDED_ENV_VAR := $(EXPENDED_ENV_VAR:EXPEND_%=%) EXPENDED_ENV_VAR := $(EXPENDED_ENV_VAR:#EXPEND_%=%)
# this creates a list of the path from the list of the variables : # this creates a list of the path from the list of the variables :
# VAR_1=/path/to_1 VAR_2=/path/to_2 # VAR_1=/path/to_1 VAR_2=/path/to_2

View File

@@ -62,7 +62,11 @@
- mes: "fixed volume variable" - mes: "fixed volume variable"
- end: 13h30 - end: 13h30
- len: 3h30 - len: 3h30
- begin: 14h - total: 3h30
- tarif: 105€
- 12/09/23
- begin: 9h30
- mes: "copy site" - mes: "copy site"
- end: h - end: h
- len: h - len: h

View File

@@ -36,18 +36,14 @@ EXECUTION_TIME=300
# 3. then it will remove the leading "EXPEND_" word # 3. then it will remove the leading "EXPEND_" word
# 4. then it will erase all the line starting with "HOST_VOLUME_" # 4. then it will erase all the line starting with "HOST_VOLUME_"
# 5. and finally it will add the expended lines after the line "EXPENDED LINES :" # 5. and finally it will add the expended lines after the line "EXPENDED LINES :"
# LINES TO EXPEND :
EXPEND_HOST_VOLUME_WP=$HOME_PATH/data/lejourduprof/wp_volume #EXPEND_HOST_VOLUME_WP=$HOME_PATH/data/lejourduprof/wp_volume
EXPEND_HOST_VOLUME_DB=$HOME_PATH/data/lejourduprof/db_volume #EXPEND_HOST_VOLUME_DB=$HOME_PATH/data/lejourduprof/db_volume
EXPEND_HOST_VOLUME_PLUGINS=$PWD_PATH/srcs/plugins #EXPEND_HOST_VOLUME_PLUGINS=$PWD_PATH/srcs/plugins
EXPEND_HOST_VOLUME_CERTS=$PWD_PATH/srcs/requirements/nginx/conf/ssl #EXPEND_HOST_VOLUME_CERTS=$PWD_PATH/srcs/requirements/nginx/conf/ssl
# EXPENDED LINES : # EXPENDED LINES :
HOST_VOLUME_CERTS=/home/asususus/Nextcloud/informatique/lejourduprof/srcs/requirements/nginx/conf/ssl HOST_VOLUME_CERTS=/home/asususus/Nextcloud/informatique/lejourduprof/srcs/requirements/nginx/conf/ssl
HOST_VOLUME_PLUGINS=/home/asususus/Nextcloud/informatique/lejourduprof/srcs/plugins HOST_VOLUME_PLUGINS=/home/asususus/Nextcloud/informatique/lejourduprof/srcs/plugins
HOST_VOLUME_DB=/home/asususus/data/lejourduprof/db_volume HOST_VOLUME_DB=/home/asususus/data/lejourduprof/db_volume
HOST_VOLUME_WP=/home/asususus/data/lejourduprof/wp_volume HOST_VOLUME_WP=/home/asususus/data/lejourduprof/wp_volume
#HOST_VOLUME_WP=/home/lenovo/data/lejourduprof/wp_volume
#HOST_VOLUME_DB=/home/lenovo/data/lejourduprof/db_volume
#HOST_VOLUME_PLUGINS=/home/lenovo/42/lejourduprof/srcs/plugins
#HOST_VOLUME_CERTS=/home/lenovo/42/lejourduprof/srcs/requirements/nginx/conf/ssl