Skip to content
GitLab
Menu
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
00356a0d
Commit
00356a0d
authored
Nov 08, 2019
by
Olaf Michaelis
Browse files
Fix user id when run by root
parent
b0966fab
Changes
1
Hide whitespace changes
Inline
Side-by-side
makefile
View file @
00356a0d
...
...
@@ -6,7 +6,7 @@ GLOBAL_PREFIX=$(shell cat ${CURDIR}/${VARS_ENV} | grep -Po "(?<=GLOBAL_PREFIX=).
FINALLY_EXPOSED_PORT
=
$(
shell
cat
${CURDIR}
/
${VARS_ENV}
|
grep
-Po
"(?<=FINALLY_EXPOSED_PORT=
)
[0-9]+"
)
RESTART_POLICY
=
$(
shell
cat
${CURDIR}
/
${VARS_ENV}
|
grep
-Po
"(?<=RESTART_POLICY=
)
.*"
)
DOCKER_IN_GROUPS
=
$(
shell
groups
|
grep
"docker"
)
MYID
=
$(
shell
i
d
-u
)
MYID
=
$(
shell
i
f
[
"
$(
shell
id -u
)
"
==
"0"
]
;
then
echo
1000
;
else
id
-u
;
fi
)
ifeq
($(strip $(DOCKER_IN_GROUPS)),)
DC_CMD
=
sudo
docker-compose
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a 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