merge from remote

.m1k1o/vlc/Dockerfile

@@ -0,0 +1,17 @@
+FROM m1k1o/neko:base
+
+#
+# install vlc
+RUN set -eux; apt-get update; \
+    apt-get install -y --no-install-recommends openbox vlc; \
+    #
+    # clean up
+    apt-get clean -y; \
+    rm -rf /var/lib/apt/lists/* /var/cache/apt/*
+
+ENV VLC_MEDIA="/media"
+
+#
+# copy configuation files
+COPY supervisord.conf /etc/neko/supervisord/vlc.conf
+COPY openbox.xml /etc/neko/openbox.xml