diff --git a/Dockerfile b/Dockerfile index aa14fd6..04d981b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,65 +1,66 @@ -FROM ghcr.io/linuxserver/baseimage-alpine:3.14 as buildstage +FROM ghcr.io/linuxserver/baseimage-alpine:3.15 as buildstage -ARG ALPINE_VERSION=3.14 -ARG XRDP_PULSE_VERSION=v0.5 +ARG ALPINE_VERSION=3.15 +ARG XRDP_PULSE_VERSION=v0.6 RUN \ - echo "**** install build deps ****" && \ - apk add --no-cache \ - alpine-sdk \ - autoconf \ - automake \ - pulseaudio-dev \ - xrdp-dev \ - xorgxrdp-dev && \ - echo "**** user perms ****" && \ - useradd builder && \ - usermod -G abuild builder + echo "**** install build deps ****" && \ + apk add --no-cache \ + alpine-sdk \ + autoconf \ + automake \ + doxygen \ + pulseaudio-dev \ + xrdp-dev \ + xorgxrdp-dev && \ + echo "**** user perms ****" && \ + useradd builder && \ + usermod -G abuild builder USER builder RUN \ - echo "**** grab aports ****" && \ - wget \ - https://gitlab.alpinelinux.org/alpine/aports/-/archive/${ALPINE_VERSION}-stable/aports-${ALPINE_VERSION}-stable.tar.gz \ - -O /tmp/aports.tar.gz && \ - cd /tmp && \ - tar -xf aports.tar.gz + echo "**** grab aports ****" && \ + wget \ + https://gitlab.alpinelinux.org/alpine/aports/-/archive/${ALPINE_VERSION}-stable/aports-${ALPINE_VERSION}-stable.tar.gz \ + -O /tmp/aports.tar.gz && \ + cd /tmp && \ + tar -xf aports.tar.gz RUN \ - echo "**** build pulseaudio from source ****" && \ - cd /tmp/aports-${ALPINE_VERSION}-stable/community/pulseaudio && \ - abuild fetch && \ - abuild unpack && \ - abuild deps && \ - abuild prepare && \ - VERSION=$(ls -1 /tmp/aports-${ALPINE_VERSION}-stable/community/pulseaudio/src/ | \ - awk -F '-' '/pulseaudio-/ {print $2; exit}') && \ - cd src/pulseaudio-${VERSION} && \ - ./configure + echo "**** build pulseaudio from source ****" && \ + cd /tmp/aports-${ALPINE_VERSION}-stable/community/pulseaudio && \ + abuild fetch && \ + abuild unpack && \ + abuild deps && \ + abuild prepare && \ + VERSION=$(ls -1 /tmp/aports-${ALPINE_VERSION}-stable/community/pulseaudio/src/ | \ + awk -F '-' '/pulseaudio-/ {print $2; exit}') && \ + cd src/pulseaudio-${VERSION} && \ + meson build RUN \ - echo "**** build pulseaudio xrdp module ****" && \ - VERSION=$(ls -1 /tmp/aports-${ALPINE_VERSION}-stable/community/pulseaudio/src/ | \ - awk -F '-' '/pulseaudio-/ {print $2; exit}') && \ - mkdir -p /tmp/buildout/usr/lib/pulse-${VERSION}/modules/ && \ - wget \ - https://github.com/neutrinolabs/pulseaudio-module-xrdp/archive/refs/tags/${XRDP_PULSE_VERSION}.tar.gz \ - -O /tmp/pulsemodule.tar.gz && \ - cd /tmp && \ - tar -xf pulsemodule.tar.gz && \ - cd pulseaudio-module-xrdp-* && \ - ./bootstrap && \ - ./configure \ - PULSE_DIR=/tmp/aports-${ALPINE_VERSION}-stable/community/pulseaudio/src/pulseaudio-${VERSION} && \ - make && \ - install -t "/tmp/buildout/usr/lib/pulse-${VERSION}/modules/" -D -m 644 src/.libs/*.so + echo "**** build pulseaudio xrdp module ****" && \ + VERSION=$(ls -1 /tmp/aports-${ALPINE_VERSION}-stable/community/pulseaudio/src/ | \ + awk -F '-' '/pulseaudio-/ {print $2; exit}') && \ + mkdir -p /tmp/buildout/usr/lib/pulse-${VERSION}/modules/ && \ + wget \ + https://github.com/neutrinolabs/pulseaudio-module-xrdp/archive/refs/tags/${XRDP_PULSE_VERSION}.tar.gz \ + -O /tmp/pulsemodule.tar.gz && \ + cd /tmp && \ + tar -xf pulsemodule.tar.gz && \ + cd pulseaudio-module-xrdp-* && \ + ./bootstrap && \ + ./configure \ + PULSE_DIR=/tmp/aports-${ALPINE_VERSION}-stable/community/pulseaudio/src/pulseaudio-${VERSION} && \ + make && \ + install -t "/tmp/buildout/usr/lib/pulse-${VERSION}/modules/" -D -m 644 src/.libs/*.so # docker compose FROM ghcr.io/linuxserver/docker-compose:amd64-alpine as compose # runtime stage -FROM ghcr.io/linuxserver/baseimage-alpine:3.14 +FROM ghcr.io/linuxserver/baseimage-alpine:3.15 # set version label ARG BUILD_DATE @@ -72,30 +73,30 @@ COPY --from=buildstage /tmp/buildout/ / COPY --from=compose /usr/local/bin/docker-compose /usr/local/bin/docker-compose RUN \ - echo "**** install deps ****" && \ - apk add --no-cache \ - dbus-x11 \ - docker \ - libpulse \ - openssh-client \ - openssl \ - pavucontrol \ - pulseaudio \ - sudo \ - xorg-server \ - xorgxrdp \ - xrdp \ - xterm && \ - VERSION=$(ls -1 /usr/lib/ | \ - awk -F '-' '/pulse-/ {print $2; exit}') && \ - ldconfig -n /usr/lib/pulse-${VERSION}/modules && \ - echo "**** cleanup and user perms ****" && \ - echo "abc:abc" | chpasswd && \ - usermod -s /bin/bash abc && \ - echo '%wheel ALL=(ALL) NOPASSWD:ALL' > /etc/sudoers.d/wheel && \ - adduser abc wheel && \ - rm -rf \ - /tmp/* + echo "**** install deps ****" && \ + apk add --no-cache \ + dbus-x11 \ + docker \ + libpulse \ + openssh-client \ + openssl \ + pavucontrol \ + pulseaudio \ + sudo \ + xorg-server \ + xorgxrdp \ + xrdp \ + xterm && \ + VERSION=$(ls -1 /usr/lib/ | \ + awk -F '-' '/pulse-/ {print $2; exit}') && \ + ldconfig -n /usr/lib/pulse-${VERSION}/modules && \ + echo "**** cleanup and user perms ****" && \ + echo "abc:abc" | chpasswd && \ + usermod -s /bin/bash abc && \ + echo '%wheel ALL=(ALL) NOPASSWD:ALL' > /etc/sudoers.d/wheel && \ + adduser abc wheel && \ + rm -rf \ + /tmp/* # add local files COPY /root / diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 01c935d..fbeaf67 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,65 +1,66 @@ -FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.14 as buildstage +FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.15 as buildstage -ARG ALPINE_VERSION=3.14 -ARG XRDP_PULSE_VERSION=v0.5 +ARG ALPINE_VERSION=3.15 +ARG XRDP_PULSE_VERSION=v0.6 RUN \ - echo "**** install build deps ****" && \ - apk add --no-cache \ - alpine-sdk \ - autoconf \ - automake \ - pulseaudio-dev \ - xrdp-dev \ - xorgxrdp-dev && \ - echo "**** user perms ****" && \ - useradd builder && \ - usermod -G abuild builder + echo "**** install build deps ****" && \ + apk add --no-cache \ + alpine-sdk \ + autoconf \ + automake \ + doxygen \ + pulseaudio-dev \ + xrdp-dev \ + xorgxrdp-dev && \ + echo "**** user perms ****" && \ + useradd builder && \ + usermod -G abuild builder USER builder RUN \ - echo "**** grab aports ****" && \ - wget \ - https://gitlab.alpinelinux.org/alpine/aports/-/archive/${ALPINE_VERSION}-stable/aports-${ALPINE_VERSION}-stable.tar.gz \ - -O /tmp/aports.tar.gz && \ - cd /tmp && \ - tar -xf aports.tar.gz + echo "**** grab aports ****" && \ + wget \ + https://gitlab.alpinelinux.org/alpine/aports/-/archive/${ALPINE_VERSION}-stable/aports-${ALPINE_VERSION}-stable.tar.gz \ + -O /tmp/aports.tar.gz && \ + cd /tmp && \ + tar -xf aports.tar.gz RUN \ - echo "**** build pulseaudio from source ****" && \ - cd /tmp/aports-${ALPINE_VERSION}-stable/community/pulseaudio && \ - abuild fetch && \ - abuild unpack && \ - abuild deps && \ - abuild prepare && \ - VERSION=$(ls -1 /tmp/aports-${ALPINE_VERSION}-stable/community/pulseaudio/src/ | \ - awk -F '-' '/pulseaudio-/ {print $2; exit}') && \ - cd src/pulseaudio-${VERSION} && \ - ./configure + echo "**** build pulseaudio from source ****" && \ + cd /tmp/aports-${ALPINE_VERSION}-stable/community/pulseaudio && \ + abuild fetch && \ + abuild unpack && \ + abuild deps && \ + abuild prepare && \ + VERSION=$(ls -1 /tmp/aports-${ALPINE_VERSION}-stable/community/pulseaudio/src/ | \ + awk -F '-' '/pulseaudio-/ {print $2; exit}') && \ + cd src/pulseaudio-${VERSION} && \ + meson build RUN \ - echo "**** build pulseaudio xrdp module ****" && \ - VERSION=$(ls -1 /tmp/aports-${ALPINE_VERSION}-stable/community/pulseaudio/src/ | \ - awk -F '-' '/pulseaudio-/ {print $2; exit}') && \ - mkdir -p /tmp/buildout/usr/lib/pulse-${VERSION}/modules/ && \ - wget \ - https://github.com/neutrinolabs/pulseaudio-module-xrdp/archive/refs/tags/${XRDP_PULSE_VERSION}.tar.gz \ - -O /tmp/pulsemodule.tar.gz && \ - cd /tmp && \ - tar -xf pulsemodule.tar.gz && \ - cd pulseaudio-module-xrdp-* && \ - ./bootstrap && \ - ./configure \ - PULSE_DIR=/tmp/aports-${ALPINE_VERSION}-stable/community/pulseaudio/src/pulseaudio-${VERSION} && \ - make && \ - install -t "/tmp/buildout/usr/lib/pulse-${VERSION}/modules/" -D -m 644 src/.libs/*.so + echo "**** build pulseaudio xrdp module ****" && \ + VERSION=$(ls -1 /tmp/aports-${ALPINE_VERSION}-stable/community/pulseaudio/src/ | \ + awk -F '-' '/pulseaudio-/ {print $2; exit}') && \ + mkdir -p /tmp/buildout/usr/lib/pulse-${VERSION}/modules/ && \ + wget \ + https://github.com/neutrinolabs/pulseaudio-module-xrdp/archive/refs/tags/${XRDP_PULSE_VERSION}.tar.gz \ + -O /tmp/pulsemodule.tar.gz && \ + cd /tmp && \ + tar -xf pulsemodule.tar.gz && \ + cd pulseaudio-module-xrdp-* && \ + ./bootstrap && \ + ./configure \ + PULSE_DIR=/tmp/aports-${ALPINE_VERSION}-stable/community/pulseaudio/src/pulseaudio-${VERSION} && \ + make && \ + install -t "/tmp/buildout/usr/lib/pulse-${VERSION}/modules/" -D -m 644 src/.libs/*.so # docker compose FROM ghcr.io/linuxserver/docker-compose:arm64v8-alpine as compose # runtime stage -FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.14 +FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.15 # set version label ARG BUILD_DATE @@ -72,30 +73,30 @@ COPY --from=buildstage /tmp/buildout/ / COPY --from=compose /usr/local/bin/docker-compose /usr/local/bin/docker-compose RUN \ - echo "**** install deps ****" && \ - apk add --no-cache \ - dbus-x11 \ - docker \ - libpulse \ - openssh-client \ - openssl \ - pavucontrol \ - pulseaudio \ - sudo \ - xorg-server \ - xorgxrdp \ - xrdp \ - xterm && \ - VERSION=$(ls -1 /usr/lib/ | \ - awk -F '-' '/pulse-/ {print $2; exit}') && \ - ldconfig -n /usr/lib/pulse-${VERSION}/modules && \ - echo "**** cleanup and user perms ****" && \ - echo "abc:abc" | chpasswd && \ - usermod -s /bin/bash abc && \ - echo '%wheel ALL=(ALL) NOPASSWD:ALL' > /etc/sudoers.d/wheel && \ - adduser abc wheel && \ - rm -rf \ - /tmp/* + echo "**** install deps ****" && \ + apk add --no-cache \ + dbus-x11 \ + docker \ + libpulse \ + openssh-client \ + openssl \ + pavucontrol \ + pulseaudio \ + sudo \ + xorg-server \ + xorgxrdp \ + xrdp \ + xterm && \ + VERSION=$(ls -1 /usr/lib/ | \ + awk -F '-' '/pulse-/ {print $2; exit}') && \ + ldconfig -n /usr/lib/pulse-${VERSION}/modules && \ + echo "**** cleanup and user perms ****" && \ + echo "abc:abc" | chpasswd && \ + usermod -s /bin/bash abc && \ + echo '%wheel ALL=(ALL) NOPASSWD:ALL' > /etc/sudoers.d/wheel && \ + adduser abc wheel && \ + rm -rf \ + /tmp/* # add local files COPY /root / diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 540df31..a4015e1 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,65 +1,66 @@ -FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.14 as buildstage +FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.15 as buildstage -ARG ALPINE_VERSION=3.14 -ARG XRDP_PULSE_VERSION=v0.5 +ARG ALPINE_VERSION=3.15 +ARG XRDP_PULSE_VERSION=v0.6 RUN \ - echo "**** install build deps ****" && \ - apk add --no-cache \ - alpine-sdk \ - autoconf \ - automake \ - pulseaudio-dev \ - xrdp-dev \ - xorgxrdp-dev && \ - echo "**** user perms ****" && \ - useradd builder && \ - usermod -G abuild builder + echo "**** install build deps ****" && \ + apk add --no-cache \ + alpine-sdk \ + autoconf \ + automake \ + doxygen \ + pulseaudio-dev \ + xrdp-dev \ + xorgxrdp-dev && \ + echo "**** user perms ****" && \ + useradd builder && \ + usermod -G abuild builder USER builder RUN \ - echo "**** grab aports ****" && \ - wget \ - https://gitlab.alpinelinux.org/alpine/aports/-/archive/${ALPINE_VERSION}-stable/aports-${ALPINE_VERSION}-stable.tar.gz \ - -O /tmp/aports.tar.gz && \ - cd /tmp && \ - tar -xf aports.tar.gz + echo "**** grab aports ****" && \ + wget \ + https://gitlab.alpinelinux.org/alpine/aports/-/archive/${ALPINE_VERSION}-stable/aports-${ALPINE_VERSION}-stable.tar.gz \ + -O /tmp/aports.tar.gz && \ + cd /tmp && \ + tar -xf aports.tar.gz RUN \ - echo "**** build pulseaudio from source ****" && \ - cd /tmp/aports-${ALPINE_VERSION}-stable/community/pulseaudio && \ - abuild fetch && \ - abuild unpack && \ - abuild deps && \ - abuild prepare && \ - VERSION=$(ls -1 /tmp/aports-${ALPINE_VERSION}-stable/community/pulseaudio/src/ | \ - awk -F '-' '/pulseaudio-/ {print $2; exit}') && \ - cd src/pulseaudio-${VERSION} && \ - ./configure + echo "**** build pulseaudio from source ****" && \ + cd /tmp/aports-${ALPINE_VERSION}-stable/community/pulseaudio && \ + abuild fetch && \ + abuild unpack && \ + abuild deps && \ + abuild prepare && \ + VERSION=$(ls -1 /tmp/aports-${ALPINE_VERSION}-stable/community/pulseaudio/src/ | \ + awk -F '-' '/pulseaudio-/ {print $2; exit}') && \ + cd src/pulseaudio-${VERSION} && \ + meson build RUN \ - echo "**** build pulseaudio xrdp module ****" && \ - VERSION=$(ls -1 /tmp/aports-${ALPINE_VERSION}-stable/community/pulseaudio/src/ | \ - awk -F '-' '/pulseaudio-/ {print $2; exit}') && \ - mkdir -p /tmp/buildout/usr/lib/pulse-${VERSION}/modules/ && \ - wget \ - https://github.com/neutrinolabs/pulseaudio-module-xrdp/archive/refs/tags/${XRDP_PULSE_VERSION}.tar.gz \ - -O /tmp/pulsemodule.tar.gz && \ - cd /tmp && \ - tar -xf pulsemodule.tar.gz && \ - cd pulseaudio-module-xrdp-* && \ - ./bootstrap && \ - ./configure \ - PULSE_DIR=/tmp/aports-${ALPINE_VERSION}-stable/community/pulseaudio/src/pulseaudio-${VERSION} && \ - make && \ - install -t "/tmp/buildout/usr/lib/pulse-${VERSION}/modules/" -D -m 644 src/.libs/*.so + echo "**** build pulseaudio xrdp module ****" && \ + VERSION=$(ls -1 /tmp/aports-${ALPINE_VERSION}-stable/community/pulseaudio/src/ | \ + awk -F '-' '/pulseaudio-/ {print $2; exit}') && \ + mkdir -p /tmp/buildout/usr/lib/pulse-${VERSION}/modules/ && \ + wget \ + https://github.com/neutrinolabs/pulseaudio-module-xrdp/archive/refs/tags/${XRDP_PULSE_VERSION}.tar.gz \ + -O /tmp/pulsemodule.tar.gz && \ + cd /tmp && \ + tar -xf pulsemodule.tar.gz && \ + cd pulseaudio-module-xrdp-* && \ + ./bootstrap && \ + ./configure \ + PULSE_DIR=/tmp/aports-${ALPINE_VERSION}-stable/community/pulseaudio/src/pulseaudio-${VERSION} && \ + make && \ + install -t "/tmp/buildout/usr/lib/pulse-${VERSION}/modules/" -D -m 644 src/.libs/*.so # docker compose FROM ghcr.io/linuxserver/docker-compose:arm32v7-alpine as compose # runtime stage -FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.14 +FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.15 # set version label ARG BUILD_DATE @@ -72,30 +73,30 @@ COPY --from=buildstage /tmp/buildout/ / COPY --from=compose /usr/local/bin/docker-compose /usr/local/bin/docker-compose RUN \ - echo "**** install deps ****" && \ - apk add --no-cache \ - dbus-x11 \ - docker \ - libpulse \ - openssh-client \ - openssl \ - pavucontrol \ - pulseaudio \ - sudo \ - xorg-server \ - xorgxrdp \ - xrdp \ - xterm && \ - VERSION=$(ls -1 /usr/lib/ | \ - awk -F '-' '/pulse-/ {print $2; exit}') && \ - ldconfig -n /usr/lib/pulse-${VERSION}/modules && \ - echo "**** cleanup and user perms ****" && \ - echo "abc:abc" | chpasswd && \ - usermod -s /bin/bash abc && \ - echo '%wheel ALL=(ALL) NOPASSWD:ALL' > /etc/sudoers.d/wheel && \ - adduser abc wheel && \ - rm -rf \ - /tmp/* + echo "**** install deps ****" && \ + apk add --no-cache \ + dbus-x11 \ + docker \ + libpulse \ + openssh-client \ + openssl \ + pavucontrol \ + pulseaudio \ + sudo \ + xorg-server \ + xorgxrdp \ + xrdp \ + xterm && \ + VERSION=$(ls -1 /usr/lib/ | \ + awk -F '-' '/pulse-/ {print $2; exit}') && \ + ldconfig -n /usr/lib/pulse-${VERSION}/modules && \ + echo "**** cleanup and user perms ****" && \ + echo "abc:abc" | chpasswd && \ + usermod -s /bin/bash abc && \ + echo '%wheel ALL=(ALL) NOPASSWD:ALL' > /etc/sudoers.d/wheel && \ + adduser abc wheel && \ + rm -rf \ + /tmp/* # add local files COPY /root /