Add tests for non-root environments.

Signed-off-by: Masaki Muranaka <monaka@monami-ya.com>

Author: monaka

dockerfiles/theia/e2e/Dockerfile

@@ -10,22 +10,23 @@ FROM ${BUILD_ORGANIZATION}/${BUILD_PARENT_IMAGE}:${BUILD_TAG} as theia
 FROM cypress/browsers:chrome67
 
 USER root
-ENV HOME=/root
 ENV NOCDN=true
 
 RUN printf "deb http://archive.debian.org/debian/ jessie main\ndeb-src http://archive.debian.org/debian/ jessie main\ndeb http://security.debian.org jessie/updates main\ndeb-src http://security.debian.org jessie/updates main" > /etc/apt/sources.list
 RUN apt-get update && \
     apt-get install -y libx11-dev libxkbfile-dev sudo iproute2
-CMD /root/docker-run.sh
 RUN yarn global add typescript@2.9.2 node-gyp && node-gyp install
 
 # Add cypress scripts and grab dependencies
-COPY src /root/
-RUN cd /root && yarn
+COPY src /projects/
+RUN cd /projects && yarn
 
 # Add tests
-ADD cypress /root/cypress/
+ADD cypress /projects/cypress/
 
 COPY --from=theia /home/theia /home/theia
 COPY --from=theia /entrypoint.sh /entrypoint.sh
 RUN find /home/theia/ -name "binding.gyp" |  xargs -i sh -c 'cd $(dirname {}) && node-gyp rebuild --ensure'
+
+USER theia
+CMD /projects/docker-run.sh

dockerfiles/theia/e2e/src/docker-run.sh

@@ -10,12 +10,12 @@
 : "${WAIT_COUNT:=30}"
 
 echo "Starting Theia..."
-rm -rf /root/logs/*
-HOME=/home/theia /entrypoint.sh > /root/logs/theia.log 2>/root/logs/theia-error.log&
+rm -rf /projects/logs/*
+HOME=/home/theia /entrypoint.sh > /projects/logs/theia.log 2>/projects/logs/theia-error.log&
 
 echo "Cleaning videos folder..."
 # Cleanup previous videos
-rm -rf /root/cypress/videos/*
+rm -rf /projects/cypress/videos/*
 
 # Find TCP 0.0.0.0:3100 that will be opened by Theia.
 sleep 5s
@@ -35,4 +35,4 @@ fi
 
 # Run tests
 echo "Run the tests"
-cd /root && unset LD_LIBRARY_PATH && /root/node_modules/.bin/cypress run -c trashAssetsBeforeRuns=false  --browser chrome
+cd /projects && unset LD_LIBRARY_PATH && /projects/node_modules/.bin/cypress run -c trashAssetsBeforeRuns=false  --browser chrome

dockerfiles/theia/e2e/test.sh

@@ -19,11 +19,14 @@ fi
 
 # Runs E2E tests in a docker container.
 run_test_in_docker_container() {
+  mkdir -p ${base_dir}/$1
   docker_exec run --rm ${DOCKER_RUN_OPTIONS} \
-       -v "${base_dir}/videos":/root/cypress/videos \
-       -v "${base_dir}/logs":/root/logs \
+       --user $1 \
+       -v "${base_dir}/$1/videos":/projects/cypress/videos \
+       -v "${base_dir}/$1/logs":/projects/logs \
        -v /var/run/docker.sock:/var/run/docker.sock \
            $IMAGE_NAME
 }
 
-run_test_in_docker_container
+run_test_in_docker_container '0:0'
+run_test_in_docker_container '1234:5678'