Skip to content

Commit 21424fe

Browse files
Peter Markirtakacs
authored andcommitted
Use regular user instead of root user in Docker (#253)
JSRemoteTest-DCO-1.0-Signed-off-by: Peter Marki [email protected]
1 parent a98c578 commit 21424fe

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

.travis.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ language: python
22

33
os: linux
44

5-
sudo: required
6-
75
services:
86
- docker
97

tools/travis_script.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,11 @@
2525

2626
DOCKER_IMAGE_NAME = 'iotjs/js_remote_test:0.6'
2727
DOCKER_NAME = 'jsremote_docker'
28-
DOCKER_ROOT_PATH = '/root'
28+
DOCKER_USERNAME = 'travis'
29+
DOCKER_WORKDIR = '/home/%s' % DOCKER_USERNAME
2930

3031
# The path to js-remote-test in Docker.
31-
DOCKER_JSREMOTE_PATH = DOCKER_ROOT_PATH + '/js-remote-test/'
32+
DOCKER_JSREMOTE_PATH = DOCKER_WORKDIR + '/js-remote-test/'
3233

3334
# Commonly used commands and arguments.
3435
BASE_COMMAND = ['python', '-m', 'jstest']
@@ -71,9 +72,13 @@ def run_docker():
7172
'''
7273
Create the Docker container where we will run the builds.
7374
'''
74-
exec_command('docker', ['run', '-dit', '--privileged', '--name', DOCKER_NAME,
75+
exec_command('docker', ['run', '-dit', '--privileged',
76+
'--name', DOCKER_NAME,
77+
'--user', DOCKER_USERNAME,
78+
'-w', DOCKER_WORKDIR,
7579
'-v', '%s:%s' % (TRAVIS_BUILD_PATH, DOCKER_JSREMOTE_PATH),
7680
'--env', 'PYTHONPATH=%s:$PYTHONPATH' % DOCKER_JSREMOTE_PATH,
81+
'--env', 'HOME=%s' % DOCKER_WORKDIR,
7782
DOCKER_IMAGE_NAME])
7883

7984

0 commit comments

Comments
 (0)