diff --git a/Dockerfile b/Dockerfile index 0f212f2..7cac8f2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -63,17 +63,24 @@ RUN sed -i '/%users/s/^/# /' /etc/sudoers && \ RUN chmod 440 /etc/sudoers && \ mkdir -p /etc/sssd && chown root:root /etc/sssd && chmod 755 /etc/sssd && \ - mkdir -p /home && chmod 755 /home && \ + mkdir -p /home && chmod 777 /home && \ chown xrdp:xrdp /etc/xrdp/key.pem /etc/xrdp/cert.pem /etc/xrdp/rsakeys.ini && \ chmod 600 /etc/xrdp/key.pem /etc/xrdp/rsakeys.ini && \ chmod 644 /etc/xrdp/cert.pem && \ echo "LANG=${LANG}" >> /etc/environment && \ echo "LANGUAGE=${LANGUAGE}" >> /etc/environment && \ echo "LC_ALL=${LC_ALL}" >> /etc/environment && \ - sed -i '2i export LANG=${LANG}\nexport LANGUAGE=${LANGUAGE}\nexport LC_ALL=${LC_ALL}\npulseaudio --start\npactl load-module module-xrdp-sink.so\npactl load-module module-xrdp-source.so' /etc/xrdp/startwm.sh && \ - chmod +x /etc/xrdp/startwm.sh && \ - mkdir -p /etc/xdg/xfce4 && \ - echo "setxkbmap ${COUNTRY}" >> /etc/xdg/xfce4/xinitrc + echo "#!/bin/sh" > /etc/xrdp/startwm.sh && \ + echo "export LANG=${LANG}" >> /etc/xrdp/startwm.sh && \ + echo "export LANGUAGE=${LANGUAGE}" >> /etc/xrdp/startwm.sh && \ + echo "export LC_ALL=${LC_ALL}" >> /etc/xrdp/startwm.sh && \ + echo "export XDG_SESSION_TYPE=x11" >> /etc/xrdp/startwm.sh && \ + echo "setxkbmap ${COUNTRY}" >> /etc/xrdp/startwm.sh && \ + echo "pulseaudio --start" >> /etc/xrdp/startwm.sh && \ + echo "pactl load-module module-xrdp-sink.so" >> /etc/xrdp/startwm.sh && \ + echo "pactl load-module module-xrdp-source.so" >> /etc/xrdp/startwm.sh && \ + echo "exec dbus-launch --exit-with-session mate-session" >> /etc/xrdp/startwm.sh && \ + chmod +x /etc/xrdp/startwm.sh EXPOSE 3389