Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Martin Koehler
rdmo-docker-compose
Commits
0f122668
Commit
0f122668
authored
May 24, 2019
by
olaf michaelis
Browse files
Fix variables replacement
parent
0216a2b8
Changes
2
Hide whitespace changes
Inline
Side-by-side
dc_master.yaml
View file @
0f122668
...
...
@@ -38,7 +38,7 @@ services:
-
rdmoapp:/vol/rdmo-app
-
ve:/vol/ve
env_file
:
-
variables.env
-
<VARIABLES_FILE>
depends_on
:
-
rdmo
...
...
@@ -49,7 +49,7 @@ services:
volumes
:
-
postgres:/var/lib/postgresql/data
env_file
:
-
variables.env
-
<VARIABLES_FILE>
rdmo
:
build
:
...
...
@@ -62,4 +62,4 @@ services:
-
rdmoapp:/vol/rdmo-app
-
ve:/vol/ve
env_file
:
-
variables.env
-
<VARIABLES_FILE>
makefile
View file @
0f122668
...
...
@@ -6,6 +6,7 @@ FINALLY_EXPOSED_PORT=$(shell cat ${CURDIR}/${VARS_ENV} | grep -Po "(?<=FINALLY_E
GLOBAL_PREFIX
=
$(
shell
cat
${CURDIR}
/
${VARS_ENV}
|
grep
-Po
"(?<=GLOBAL_PREFIX=
)
.*"
)
all
:
preparations run_build tail_logs
preps
:
preparations
build
:
preparations run_build
fromscratch
:
preparations run_remove run_build
remove
:
run_remove
...
...
@@ -20,6 +21,7 @@ preparations:
|
sed
's|<CURDIR>|
${CURDIR}
|g'
\
|
sed
's|<GLOBAL_PREFIX>|
${GLOBAL_PREFIX}
|g'
\
|
sed
's|<FINALLY_EXPOSED_PORT>|
${FINALLY_EXPOSED_PORT}
|g'
\
|
sed
's|<VARIABLES_FILE>|
${VARS_ENV}
|g'
\
>
${DC_TEMP}
run_build
:
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment