From c68552a172e26840f0391dcf9490dded3158b6c7 Mon Sep 17 00:00:00 2001 From: cruizba Date: Wed, 1 Jul 2020 20:18:58 +0200 Subject: [PATCH] Adapted create_image recording to jenkins job --- .../docker/openvidu-recording/create_image.sh | 7 ++++++- .../docker/openvidu-recording/ubuntu-16-04.Dockerfile | 9 ++++++--- .../docker/openvidu-recording/ubuntu-20-04.Dockerfile | 10 +++++++--- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/openvidu-server/docker/openvidu-recording/create_image.sh b/openvidu-server/docker/openvidu-recording/create_image.sh index b2b6848b..10ffce47 100755 --- a/openvidu-server/docker/openvidu-recording/create_image.sh +++ b/openvidu-server/docker/openvidu-recording/create_image.sh @@ -1 +1,6 @@ -docker build --rm -f $1.Dockerfile -t openvidu/openvidu-recording . +#!/bin/bash -x +OPENVIDU_RECORDING_UBUNTU_VERSION=$1 +OPENVIDU_RECORDING_CHROME_VERSION=$2 +OPENVIDU_RECORDING_DOCKER_TAG=$3 +docker build --rm --build-arg CHROME_VERSION="$CHROME_VERSION" -f $UBUNTU_VERSION.Dockerfile -t openvidu/openvidu-recording:$OPENVIDU_RECORDING_DOCKER_TAG . +docker push openvidu/openvidu-recording:$OPENVIDU_RECORDING_DOCKER_TAG diff --git a/openvidu-server/docker/openvidu-recording/ubuntu-16-04.Dockerfile b/openvidu-server/docker/openvidu-recording/ubuntu-16-04.Dockerfile index f96eb999..bee21093 100644 --- a/openvidu-server/docker/openvidu-recording/ubuntu-16-04.Dockerfile +++ b/openvidu-server/docker/openvidu-recording/ubuntu-16-04.Dockerfile @@ -1,11 +1,14 @@ FROM ubuntu:16.04 MAINTAINER openvidu@gmail.com +ARG CHROME_VERSION + # Install Chrome RUN apt-get update && apt-get -y upgrade && apt-get install -y wget sudo -RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - && \ - echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" | tee /etc/apt/sources.list.d/google-chrome.list && \ - apt-get update && apt-get install -y google-chrome-stable +RUN wget http://dl.google.com/linux/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${CHROME_VERSION}_amd64.deb \ + && apt install -y ./google-chrome-stable_${CHROME_VERSION}_amd64.deb \ + && rm google-chrome-stable_${CHROME_VERSION}_amd64.deb \ + && google-chrome --version # Install media packages RUN apt-get install -y software-properties-common diff --git a/openvidu-server/docker/openvidu-recording/ubuntu-20-04.Dockerfile b/openvidu-server/docker/openvidu-recording/ubuntu-20-04.Dockerfile index 1099444f..dbd3a407 100644 --- a/openvidu-server/docker/openvidu-recording/ubuntu-20-04.Dockerfile +++ b/openvidu-server/docker/openvidu-recording/ubuntu-20-04.Dockerfile @@ -1,6 +1,8 @@ FROM ubuntu:20.04 MAINTAINER openvidu@gmail.com +ARG CHROME_VERSION + # Install packages RUN apt-get update && apt-get -y upgrade && apt-get install -y \ wget \ @@ -14,9 +16,11 @@ RUN apt-get update && apt-get -y upgrade && apt-get install -y \ jq \ && rm -rf /var/lib/apt/lists/* -RUN wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | apt-key add - && \ - sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google-chrome.list' -RUN apt-get update && DEBIAN_FRONTEND="noninteractive" apt-get install -y google-chrome-stable && rm -rf /var/lib/apt/lists/* +# Install chrome +RUN apt-get update && apt-get -y upgrade && apt-get install -y wget sudo +RUN wget -q -O - http://dl.google.com/linux/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${CHROME_VERSION}_amd64.deb \ + && dpkg -i google-chrome-stable_${CHROME_VERSION}_amd64.deb \ + && rm google-chrome-stable_${CHROME_VERSION}_amd64.deb # Clean RUN apt-get clean && apt-get autoclean && apt-get autoremove