diff --git a/.docker/files/deps/Dockerfile b/.docker/files/deps/Dockerfile index 5615f7cd..715083a8 100644 --- a/.docker/files/deps/Dockerfile +++ b/.docker/files/deps/Dockerfile @@ -1,37 +1,11 @@ FROM debian:stretch-slim -# -# avoid warnings by switching to noninteractive -ENV DEBIAN_FRONTEND=noninteractive - -ARG USERNAME=neko -ARG USER_UID=1000 -ARG USER_GID=$USER_UID - # # install neko dependencies RUN set -eux; apt-get update; \ - apt-get install -y --no-install-recommends wget ca-certificates pulseaudio openbox dbus-x11 xserver-xorg-video-dummy supervisor; \ + apt-get install -y --no-install-recommends pulseaudio openbox dbus-x11 xserver-xorg-video-dummy supervisor; \ apt-get install -y --no-install-recommends libcairo2 libxcb1 libxrandr2 libxv1 libopus0 libvpx4; \ # - # create a non-root user - groupadd --gid $USER_GID $USERNAME; \ - useradd --uid $USER_UID --gid $USERNAME --shell /bin/bash --create-home $USERNAME; \ - adduser $USERNAME audio; \ - adduser $USERNAME video; \ - adduser $USERNAME pulse; \ - # - # setup pulseaudio - mkdir -p /home/$USERNAME/.config/pulse/; \ - echo "default-server=unix:/tmp/pulseaudio.socket" > /home/$USERNAME/.config/pulse/client.conf; \ - # - # workaround for an X11 problem: http://blog.tigerteufel.de/?p=476 - mkdir /tmp/.X11-unix; chmod 1777 /tmp/.X11-unix; chown $USERNAME /tmp/.X11-unix/; \ - # - # make directories for neko - mkdir -p /etc/neko /var/www /var/log/neko; chmod 1777 /var/log/neko; chown $USERNAME /var/log/neko/; \ - chown -R $USERNAME:$USERNAME /home/$USERNAME; \ - # # clean up apt-get clean -y; \ rm -rf /var/lib/apt/lists/* /var/cache/apt/* @@ -45,20 +19,3 @@ ENV PKG_CONFIG_PATH=/gst/local/lib/pkgconfig:$PKG_CONFIG_PATH # # copy gst COPY .build/gst/local /gst/local/ - -# -# env -ENV USER=$USERNAME -ENV DISPLAY=:99.0 - -# -# copy configuation files -COPY .docker/files/dbus /usr/bin/dbus -COPY .docker/files/openbox.xml /etc/neko/openbox.xml -COPY .docker/files/supervisord.conf /etc/neko/supervisord.conf -COPY .docker/files/xorg.conf /etc/neko/xorg.conf -COPY .docker/files/default.pa /etc/pulse/default.pa - -# -# run neko -CMD ["/usr/bin/supervisord", "-c", "/etc/neko/supervisord.conf"] \ No newline at end of file