From ce91f1000515dad1c562b1339eb4cf763f1bbd84 Mon Sep 17 00:00:00 2001 From: pabloFuente Date: Thu, 2 Jul 2020 17:11:18 +0200 Subject: [PATCH] openvidu-test-e2e images Docker installation --- openvidu-test-e2e/docker/bionic/Dockerfile | 5 ++++- openvidu-test-e2e/docker/xenial/Dockerfile | 5 ++++- openvidu-test-e2e/jenkins/Jenkinsfile | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/openvidu-test-e2e/docker/bionic/Dockerfile b/openvidu-test-e2e/docker/bionic/Dockerfile index 1b008583..2e0255ce 100644 --- a/openvidu-test-e2e/docker/bionic/Dockerfile +++ b/openvidu-test-e2e/docker/bionic/Dockerfile @@ -39,9 +39,12 @@ RUN add-apt-repository ppa:jonathonf/ffmpeg-4 RUN apt-get update RUN apt-get install -y ffmpeg +# docker +RUN apt-get update && apt-get -y install docker.io + # Cleanup RUN rm -rf /var/lib/apt/lists/* -RUN apt-get autoremove --purge -y +RUN apt-get autoremove --purge -y && apt-get autoclean COPY entrypoint.sh /entrypoint.sh RUN ["chmod", "+x", "/entrypoint.sh"] diff --git a/openvidu-test-e2e/docker/xenial/Dockerfile b/openvidu-test-e2e/docker/xenial/Dockerfile index 1ae60425..7249fb1b 100644 --- a/openvidu-test-e2e/docker/xenial/Dockerfile +++ b/openvidu-test-e2e/docker/xenial/Dockerfile @@ -39,9 +39,12 @@ RUN add-apt-repository ppa:jonathonf/ffmpeg-4 RUN apt-get update RUN apt-get install -y ffmpeg +# docker +RUN apt-get update && apt-get -y install docker.io + # Cleanup RUN rm -rf /var/lib/apt/lists/* -RUN apt-get autoremove --purge -y +RUN apt-get autoremove --purge -y && apt-get autoclean COPY entrypoint.sh /entrypoint.sh RUN ["chmod", "+x", "/entrypoint.sh"] diff --git a/openvidu-test-e2e/jenkins/Jenkinsfile b/openvidu-test-e2e/jenkins/Jenkinsfile index e850e34d..762d0aa7 100644 --- a/openvidu-test-e2e/jenkins/Jenkinsfile +++ b/openvidu-test-e2e/jenkins/Jenkinsfile @@ -8,7 +8,7 @@ node('container') { docker.image('selenium/standalone-firefox:latest').withRun('-p 6667:4444 --name firefox --shm-size=1g') { d -> def mycontainer = docker.image('openvidu/openvidu-test-e2e:$DISTRO') mycontainer.pull() - mycontainer.inside("--name e2e -p 4200:4200 -p 4443:4443 -u root -e MY_UID=0 -v /var/run/docker.sock:/var/run/docker.sock:rw -v /dev/shm:/dev/shm -v /opt/openvidu:/opt/openvidu") { + mycontainer.inside("--name e2e -p 4200:4200 -p 4443:4443 -u root -e MY_UID=0 -v /var/run/docker.sock:/var/run/docker.sock:rw -v /dev/shm:/dev/shm -v /opt/openvidu:/opt/openvidu --privileged") { stage('Preparation') { sh 'rm -rf ~/.m2 || true' sh 'rm -rf openvidu || true'