|
@@ -1,38 +1,40 @@
|
|
|
-FROM alpine:3.5
|
|
|
+FROM debian:stretch
|
|
|
|
|
|
|
|
|
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
|
|
|
|
|
|
|
|
|
-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
|
|
|
|
|
|
|
|
|
-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
|
|
|
|
|
|
|
|
|
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
|