From cbaa1049356f00a4dc0768b75b1c9be69290911d Mon Sep 17 00:00:00 2001
From: Jessica Frazelle <jess@docker.com>
Date: Thu, 1 Jan 2015 12:42:14 -0800
Subject: [PATCH] updates to skype

---
 skype/Dockerfile | 44 +++++++++++---------------------------------
 1 file changed, 11 insertions(+), 33 deletions(-)

diff --git a/skype/Dockerfile b/skype/Dockerfile
index 5f58936..b521f98 100644
--- a/skype/Dockerfile
+++ b/skype/Dockerfile
@@ -1,17 +1,20 @@
+# Run skype in a container
+#
+# docker run -v /tmp/.X11-unix:/tmp/.X11-unix \
+#     -v /dev/snd:/dev/snd \
+#     -e DISPLAY=unix$DISPLAY \
+#     jess/skype
+#
 FROM debian:jessie
 
 # Tell debconf to run in non-interactive mode
 ENV DEBIAN_FRONTEND noninteractive
 
 # Setup multiarch because Skype is 32bit only
-RUN dpkg --add-architecture i386
-
 # Make sure the repository information is up to date
-RUN apt-get update && apt-get install -y \
+RUN dpkg --add-architecture i386 && \
+    apt-get update && apt-get install -y \
     curl \
-    libpulse0:i386 \
-    openssh-server \
-    pulseaudio:i386 \
     --no-install-recommends
 
 
@@ -20,30 +23,5 @@ RUN curl http://download.skype.com/linux/skype-debian_4.3.0.37-1_i386.deb > /usr
     dpkg -i /usr/src/skype.deb || true && \
     apt-get install -fy
 
-# Create user skype
-RUN useradd -m -d /home/skype skype
-RUN echo "skype:skype" | chpasswd
-
-# Create OpenSSH privilege separation directory, enable X11Forwarding
-RUN mkdir -p /var/run/sshd && \
-    echo 'X11Forwarding yes' >> /etc/ssh/ssh_config
-
-# Prepare ssh config folder so we can upload SSH public key later
-RUN mkdir /home/skype/.ssh && \
-    chown -R skype:skype /home/skype && \
-    chown -R skype:skype /home/skype/.ssh
-
-# Set locale (fix locale warnings)
-RUN localedef -v -c -i en_US -f UTF-8 en_US.UTF-8 || true && \
-    echo "America/Los_Angeles" > /etc/timezone
-
-# Set up the launch wrapper - sets up PulseAudio to work correctly
-RUN echo 'export PULSE_SERVER="tcp:localhost:64713"' >> /usr/local/bin/skype-pulseaudio && \
-    echo 'PULSE_LATENCY_MSEC=60 skype' >> /usr/local/bin/skype-pulseaudio && \
-    chmod 755 /usr/local/bin/skype-pulseaudio
-
-# Expose the SSH port
-EXPOSE 22
-
-# Start SSH
-ENTRYPOINT ["/usr/sbin/sshd",  "-D"]
+# Start Skype
+ENTRYPOINT ["skype"]