File tree 4 files changed +14
-4
lines changed
4 files changed +14
-4
lines changed Original file line number Diff line number Diff line change 4
4
VERSION := $(shell cat /proc/version)
5
5
# SAN this is a hack so that docker-compose works in the linux virtual environment under Windows
6
6
ifneq (,$(findstring Microsoft,$(VERSION ) ) )
7
- export DOCKER_COMPOSE =docker-compose.exe
8
- export DOCKER =docker.exe
7
+ export DOCKER_COMPOSE =docker-compose
8
+ export DOCKER =docker
9
+ export RUN_DOCKER_ENGINE_ROOT =1
9
10
else
10
11
export DOCKER_COMPOSE =docker-compose
11
12
export DOCKER =docker
13
+ export RUN_DOCKER_ENGINE_ROOT =0
12
14
endif
13
15
14
16
PY_FILES = $(strip $(shell find services packages -iname '* .py' -not -path "* egg* " -not -path "* contrib* ") )
15
-
16
17
export PYTHONPATH=${CURDIR}/packages/s3wrapper/src :${CURDIR}/packages/simcore-sdk/src
17
18
18
19
all :
Original file line number Diff line number Diff line change @@ -103,6 +103,7 @@ services:
103
103
- S3_ACCESS_KEY=${S3_ACCESS_KEY}
104
104
- S3_SECRET_KEY=${S3_SECRET_KEY}
105
105
- S3_BUCKET_NAME=${S3_BUCKET_NAME}
106
+ - RUN_DOCKER_ENGINE_ROOT=${RUN_DOCKER_ENGINE_ROOT}
106
107
depends_on :
107
108
- rabbit
108
109
# --------------------------------------------------------------------
Original file line number Diff line number Diff line change @@ -16,4 +16,10 @@ chown -R scu:scu /home/scu/input
16
16
chown -R scu:scu /home/scu/output
17
17
chown -R scu:scu /home/scu/log
18
18
19
- su-exec scu " $@ "
19
+ if [[ ${RUN_DOCKER_ENGINE_ROOT} == " 1" ]]
20
+ then
21
+ echo " running from windows host as root..."
22
+ exec " $@ "
23
+ else
24
+ su-exec scu " $@ "
25
+ fi
Original file line number Diff line number Diff line change @@ -66,6 +66,7 @@ VOLUME /home/scu/packages
66
66
VOLUME /home/scu/services/sidecar
67
67
68
68
ENV DEBUG 1
69
+ ENV RUN_DOCKER_ENGINE_ROOT=0
69
70
USER root
70
71
ENTRYPOINT [ "/bin/sh" , ".docker/entrypoint.sh" ]
71
72
CMD ./boot.sh
@@ -98,6 +99,7 @@ RUN . $HOME/.venv/bin/activate; pip list &&\
98
99
rm -rf $HOME/services
99
100
100
101
ENV DEBUG 0
102
+ ENV RUN_DOCKER_ENGINE_ROOT=0
101
103
USER root
102
104
ENTRYPOINT [ "/bin/sh" , ".docker/entrypoint.sh" ]
103
105
CMD ./boot.sh
You can’t perform that action at this time.
0 commit comments