diff --git a/Dockerfile b/Dockerfile index 34804c03..0aae7e63 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,34 +8,13 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="thelamer" RUN \ - echo "**** install build deps ****" && \ - pacman -Sy --noconfirm --needed \ - base-devel \ - git && \ - echo "**** build AUR packages ****" && \ - cd /tmp && \ - AUR_PACKAGES="\ - dbus-x11" && \ - pacman -Rns --noconfirm -dd dbus && \ - for PACKAGE in ${AUR_PACKAGES}; do \ - git clone https://aur.archlinux.org/${PACKAGE}.git && \ - chown -R abc:abc ${PACKAGE} && \ - cd ${PACKAGE} && \ - sudo -u abc makepkg -sAci --skipinteg --noconfirm --needed && \ - cd /tmp ;\ - done && \ echo "**** install packages ****" && \ pacman -Sy --noconfirm --needed \ firefox \ mousepad \ - pavucontrol \ xfce4 \ xfce4-pulseaudio-plugin && \ echo "**** cleanup ****" && \ - pacman -Rsn --noconfirm \ - gcc \ - git \ - $(pacman -Qdtq) && \ rm -rf \ /tmp/* \ /var/cache/pacman/pkg/* \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 73271554..a6babc92 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -8,34 +8,13 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="thelamer" RUN \ - echo "**** install build deps ****" && \ - pacman -Sy --noconfirm --needed \ - base-devel \ - git && \ - echo "**** build AUR packages ****" && \ - cd /tmp && \ - AUR_PACKAGES="\ - dbus-x11" && \ - pacman -Rns --noconfirm -dd dbus && \ - for PACKAGE in ${AUR_PACKAGES}; do \ - git clone https://aur.archlinux.org/${PACKAGE}.git && \ - chown -R abc:abc ${PACKAGE} && \ - cd ${PACKAGE} && \ - sudo -u abc makepkg -sAci --skipinteg --noconfirm --needed && \ - cd /tmp ;\ - done && \ echo "**** install packages ****" && \ pacman -Sy --noconfirm --needed \ firefox \ mousepad \ - pavucontrol \ xfce4 \ xfce4-pulseaudio-plugin && \ echo "**** cleanup ****" && \ - pacman -Rsn --noconfirm \ - gcc \ - git \ - $(pacman -Qdtq) && \ rm -rf \ /tmp/* \ /var/cache/pacman/pkg/* \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 849ea7f1..fdb29020 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -8,34 +8,13 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="thelamer" RUN \ - echo "**** install build deps ****" && \ - pacman -Sy --noconfirm --needed \ - base-devel \ - git && \ - echo "**** build AUR packages ****" && \ - cd /tmp && \ - AUR_PACKAGES="\ - dbus-x11" && \ - pacman -Rns --noconfirm -dd dbus && \ - for PACKAGE in ${AUR_PACKAGES}; do \ - git clone https://aur.archlinux.org/${PACKAGE}.git && \ - chown -R abc:abc ${PACKAGE} && \ - cd ${PACKAGE} && \ - sudo -u abc makepkg -sAci --skipinteg --noconfirm --needed && \ - cd /tmp ;\ - done && \ echo "**** install packages ****" && \ pacman -Sy --noconfirm --needed \ firefox \ mousepad \ - pavucontrol \ xfce4 \ xfce4-pulseaudio-plugin && \ echo "**** cleanup ****" && \ - pacman -Rsn --noconfirm \ - gcc \ - git \ - $(pacman -Qdtq) && \ rm -rf \ /tmp/* \ /var/cache/pacman/pkg/* \ diff --git a/root/defaults/startwm.sh b/root/defaults/startwm.sh index bce8b368..bcc48e0c 100755 --- a/root/defaults/startwm.sh +++ b/root/defaults/startwm.sh @@ -1,3 +1,3 @@ #!/bin/bash -PULSE_SCRIPT=/etc/xrdp/pulse/default.pa /usr/bin/pulseaudio --start +PULSE_SCRIPT=/etc/xrdp/pulse/default.pa /startpulse.sh --start & /usr/bin/startxfce4 > /dev/null 2>&1