Bladeren bron

Switch to debian:stretch

Andrew Phillips 7 jaren geleden
bovenliggende
commit
799d46faaf
2 gewijzigde bestanden met toevoegingen van 32 en 30 verwijderingen
  1. 28 26
      Dockerfile
  2. 4 4
      README.md

+ 28 - 26
Dockerfile

@@ -1,38 +1,40 @@
-FROM alpine:3.5
+FROM debian:stretch
 
 # Setup demo environment variables
 ENV HOME=/root \
-	DEBIAN_FRONTEND=noninteractive \
-	LANG=en_US.UTF-8 \
-	LANGUAGE=en_US.UTF-8 \
-	LC_ALL=C.UTF-8 \
-	DISPLAY=:0.0 \
-	DISPLAY_WIDTH=1024 \
-	DISPLAY_HEIGHT=768
+    DEBIAN_FRONTEND=noninteractive \
+    LANG=en_US.UTF-8 \
+    LANGUAGE=en_US.UTF-8 \
+    LC_ALL=C.UTF-8 \
+    DISPLAY=:0.0 \
+    DISPLAY_WIDTH=1024 \
+    DISPLAY_HEIGHT=768
 
 # Install git, supervisor, VNC, & X11 packages
-RUN apk --update --upgrade add \
-	bash \
-	fluxbox \
-	git \
-	socat \
-	supervisor \
-	x11vnc \
-	xterm \
-	xvfb
+RUN set -ex; \
+    apt-get update; \
+    apt-get install -y \
+      bash \
+      fluxbox \
+      git \
+      socat \
+      supervisor \
+      x11vnc \
+      xterm \
+      xvfb
 
 # Clone noVNC from github
-RUN git clone https://github.com/kanaka/noVNC.git /root/noVNC \
-	&& git clone https://github.com/kanaka/websockify /root/noVNC/utils/websockify \
-	&& rm -rf /root/noVNC/.git \
-	&& rm -rf /root/noVNC/utils/websockify/.git \
-	&& apk del git
-
-COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
+RUN set -ex; \
+    git clone https://github.com/kanaka/noVNC.git /root/noVNC; \
+    git clone https://github.com/kanaka/websockify /root/noVNC/utils/websockify; \
+    rm -rf /root/noVNC/.git; \
+    rm -rf /root/noVNC/utils/websockify/.git; \
+    apt-get remove -y --purge git
 
 # Modify the launch script 'ps -p'
 RUN sed -i -- "s/ps -p/ps -o pid | grep/g" /root/noVNC/utils/launch.sh
 
-EXPOSE 8080
+COPY . /app
 
-CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"]
+CMD ["/usr/bin/supervisord", "-c", "/app/supervisord.conf"]
+EXPOSE 8080

+ 4 - 4
README.md

@@ -1,10 +1,10 @@
-This is based on @psharkey's work: https://github.com/psharkey/docker/tree/master/novnc
+This is based on the alpine container by @psharkey: https://github.com/psharkey/docker/tree/master/novnc
 
-[![](https://badge.imagelayers.io/psharkey/novnc:latest.svg)](https://imagelayers.io/?images=psharkey/novnc:latest 'Get your own badge on imagelayers.io')
-# Alpine X11 Display Container
+# noVNC Display Container
 ```
 ```
-This image is intended to be used for displaying X11 applications from other containers in a browser. A stand-alone demo as well as a [Version 2](https://docs.docker.com/compose/compose-file/#version-2) composition. Thanks to [Alpine](https://hub.docker.com/_/alpine/), this image is < 100Mb and eliminates the need to run an X11 server on your host machine.
+This image is intended to be used for displaying X11 applications from other containers in a browser. A stand-alone demo as well as a [Version 2](https://docs.docker.com/compose/compose-file/#version-2) composition.
+
 ## Image Contents
 ___
 * [Xvfb](http://www.x.org/releases/X11R7.6/doc/man/man1/Xvfb.1.xhtml) - X11 in a virtual framebuffer