From c20179bec2ccc203b16cbb61f3ece3e88d6377e0 Mon Sep 17 00:00:00 2001 From: samswett Date: Mon, 22 Jan 2018 13:40:58 -0800 Subject: [PATCH 1/3] Update Dockerfile --- x11-novnc-skype/Dockerfile | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/x11-novnc-skype/Dockerfile b/x11-novnc-skype/Dockerfile index a3b5a75..302f07d 100644 --- a/x11-novnc-skype/Dockerfile +++ b/x11-novnc-skype/Dockerfile @@ -1,4 +1,4 @@ -FROM phusion/baseimage:0.9.18 +FROM phusion/baseimage:0.9.22 # Set correct environment variables ENV HOME /root @@ -6,24 +6,24 @@ ENV DEBIAN_FRONTEND noninteractive ENV LC_ALL C.UTF-8 ENV LANG en_US.UTF-8 ENV LANGUAGE en_US.UTF-8 -ENV TZ=US/Pacific +#ENV TZ=US/Pacific ENV SCREEN_RESOLUTION 1280x900 -RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone - -# Installing apps -RUN apt-get update && apt-get -y install \ - xvfb \ - x11vnc \ - supervisor \ - fluxbox \ - git-core \ - git - -# Obtain Skype -RUN curl -s 'https://repo.skype.com/latest/skypeforlinux-64.deb' -o /root/skype.deb && \ - dpkg -i /root/skype.deb || true && \ - apt-get install -fy && \ - rm /root/skype.deb +#RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone + +# install skypeforlinux +RUN apt-get update && \ + curl https://repo.skype.com/data/SKYPE-GPG-KEY | apt-key add - && \ + echo "deb [arch=amd64] https://repo.skype.com/deb stable main" | \ + tee /etc/apt/sources.list.d/skypeforlinux.list && \ + apt-get update && \ + apt-get install -y skypeforlinux \ + xvfb \ + x11vnc \ + supervisor \ + fluxbox \ + git-core \ + git \ + apt-transport-https # House cleaning RUN apt-get autoclean From 531bd24a5c0bed399ea930ff338fb5988ff8b52a Mon Sep 17 00:00:00 2001 From: samswett Date: Mon, 22 Jan 2018 14:22:54 -0800 Subject: [PATCH 2/3] lock to skype 8.11.0.4 --- x11-novnc-skype/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-novnc-skype/Dockerfile b/x11-novnc-skype/Dockerfile index 302f07d..0c2a2f2 100644 --- a/x11-novnc-skype/Dockerfile +++ b/x11-novnc-skype/Dockerfile @@ -16,7 +16,7 @@ RUN apt-get update && \ echo "deb [arch=amd64] https://repo.skype.com/deb stable main" | \ tee /etc/apt/sources.list.d/skypeforlinux.list && \ apt-get update && \ - apt-get install -y skypeforlinux \ + apt-get install -y skypeforlinux=8.11.0.4 \ xvfb \ x11vnc \ supervisor \ From f6699daeadf68bf8d2850a9f89d60b47c2f1b120 Mon Sep 17 00:00:00 2001 From: samswett Date: Wed, 7 Feb 2018 09:09:26 -0800 Subject: [PATCH 3/3] update to 8.15.0.4 --- x11-novnc-skype/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-novnc-skype/Dockerfile b/x11-novnc-skype/Dockerfile index 0c2a2f2..f6d4284 100644 --- a/x11-novnc-skype/Dockerfile +++ b/x11-novnc-skype/Dockerfile @@ -16,7 +16,7 @@ RUN apt-get update && \ echo "deb [arch=amd64] https://repo.skype.com/deb stable main" | \ tee /etc/apt/sources.list.d/skypeforlinux.list && \ apt-get update && \ - apt-get install -y skypeforlinux=8.11.0.4 \ + apt-get install -y skypeforlinux=8.15.0.4 \ xvfb \ x11vnc \ supervisor \