Merge branch 'dev' of github.com:m1k1o/neko into dev

This commit is contained in:
Miroslav Šedivý 2020-06-19 02:41:16 +02:00
commit 2f7ac7e00f

View File

@ -99,10 +99,10 @@ RUN set -eux; apt-get update; \
# #
# copy config files # copy config files
COPY .docker/dbus /usr/bin/dbus COPY .m1k1o/base/dbus /usr/bin/dbus
COPY .docker/default.pa /etc/pulse/default.pa COPY .m1k1o/base/default.pa /etc/pulse/default.pa
COPY .docker/supervisord.conf /etc/neko/supervisord.conf COPY .m1k1o/base/supervisord.conf /etc/neko/supervisord.conf
COPY .docker/xorg.conf /etc/neko/xorg.conf COPY .m1k1o/base/xorg.conf /etc/neko/xorg.conf
# #
# set default envs # set default envs