Switch from PulseAudio to PipeWire for 24.04

yama07 · Jun 16, 2024 · 0a74f80 · 0a74f80
1 parent 1e1df9f
commit 0a74f80
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 54 deletions.
diff --git a/.github/workflows/ubuntu24.04_all.yml b/.github/workflows/ubuntu24.04_all.yml
@@ -10,9 +10,9 @@ jobs:
     uses: ./.github/workflows/xrdp-ubuntu24.04.yml
     secrets: inherit
 
-  xrdp-ubuntu24_04_pulseaudio:
+  xrdp-ubuntu24_04_audio:
     needs: [xrdp-ubuntu24_04]
-    uses: ./.github/workflows/xrdp-ubuntu24.04_pulseaudio.yml
+    uses: ./.github/workflows/xrdp-ubuntu24.04_audio.yml
     secrets: inherit
 
   xrdp-ubuntu24_04_slim:

diff --git a/...workflows/xrdp-ubuntu24.04_pulseaudio.yml → .github/workflows/xrdp-ubuntu24.04_audio.yml b/...workflows/xrdp-ubuntu24.04_pulseaudio.yml → .github/workflows/xrdp-ubuntu24.04_audio.yml
@@ -1,4 +1,4 @@
-name: Publish Docker image xrdp/ubuntu24.04_pulseaudio
+name: Publish Docker image xrdp/ubuntu24.04_audio
 
 on: [workflow_dispatch, workflow_call]
 
@@ -27,8 +27,8 @@ jobs:
         with:
           push: true
           context: xrdp
-          file: xrdp/Dockerfile.ubuntu24.04_pulseaudio
+          file: xrdp/Dockerfile.ubuntu24.04_audio
           platforms: linux/amd64,linux/arm64
           tags: |
-            ${{ secrets.DOCKERHUB_USERNAME }}/docker-ubuntu-lxde:24.04-xrdp-pulseaudio_ja
-            ${{ secrets.DOCKERHUB_USERNAME }}/docker-ubuntu-lxde:noble-xrdp-pulseaudio_ja
+            ${{ secrets.DOCKERHUB_USERNAME }}/docker-ubuntu-lxde:24.04-xrdp-audio_ja
+            ${{ secrets.DOCKERHUB_USERNAME }}/docker-ubuntu-lxde:noble-xrdp-audio_ja
diff --git a/README.md b/README.md
@@ -23,11 +23,11 @@ Ubuntu の LXDE/LXQt デスクトップ環境の Docker image です。
 ### XRDP
 
 - [![Docker Image Size (tag)](https://img.shields.io/docker/image-size/yama07/docker-ubuntu-lxde/24.04-xrdp_ja?style=flat-square)](https://hub.docker.com/r/yama07/docker-ubuntu-lxde/tags?name=24.04-xrdp_ja)
-  `24.04-xrdp_ja`, `noble-xrdp_ja`: Ubuntu24.04 ベース [(xrdp/Dockerfile.ubuntu24.04)](https://github.com/yama07/docker-ubuntu-lxde/blob/master/xrdp/Dockerfile.ubuntu24.04)
+  `24.04-xrdp_ja`, `noble-xrdp_ja`: Ubuntu24.04 ベース LXQt [(xrdp/Dockerfile.ubuntu24.04)](https://github.com/yama07/docker-ubuntu-lxde/blob/master/xrdp/Dockerfile.ubuntu24.04)
 - [![Docker Image Size (tag)](https://img.shields.io/docker/image-size/yama07/docker-ubuntu-lxde/24.04-xrdp-slim_ja?style=flat-square)](https://hub.docker.com/r/yama07/docker-ubuntu-lxde/tags?name=24.04-xrdp-slim_ja)
-  `24.04-xrdp-slim_ja`, `noble-xrdp-slim_ja`: サイズを軽量化した Ubuntu24.04 ベース [(xrdp/Dockerfile.ubuntu24.04)](https://github.com/yama07/docker-ubuntu-lxde/blob/master/xrdp/Dockerfile.ubuntu24.04)
-- [![Docker Image Size (tag)](https://img.shields.io/docker/image-size/yama07/docker-ubuntu-lxde/24.04-xrdp-pulseaudio_ja?style=flat-square)](https://hub.docker.com/r/yama07/docker-ubuntu-lxde/tags?name=24.04-xrdp-pulseaudio_ja)
-  `24.04-xrdp-pulseaudio_ja`, `noble-xrdp-pulseaudio_ja`: 音声転送可能な Ubuntu24.04 ベース [(xrdp/Dockerfile.ubuntu24.04_pulseaudio)](https://github.com/yama07/docker-ubuntu-lxde/blob/master/xrdp/Dockerfile.ubuntu24.04_pulseaudio)
+  `24.04-xrdp-slim_ja`, `noble-xrdp-slim_ja`: サイズを軽量化した Ubuntu24.04 ベース LXQt [(xrdp/Dockerfile.ubuntu24.04)](https://github.com/yama07/docker-ubuntu-lxde/blob/master/xrdp/Dockerfile.ubuntu24.04)
+- [![Docker Image Size (tag)](https://img.shields.io/docker/image-size/yama07/docker-ubuntu-lxde/24.04-xrdp-audio_ja?style=flat-square)](https://hub.docker.com/r/yama07/docker-ubuntu-lxde/tags?name=24.04-xrdp-audio_ja)
+  `24.04-xrdp-audio_ja`, `noble-xrdp-audio_ja`: 音声転送可能な Ubuntu24.04 ベース LXQt [(xrdp/Dockerfile.ubuntu24.04_audio)](https://github.com/yama07/docker-ubuntu-lxde/blob/master/xrdp/Dockerfile.ubuntu24.04_audio)
 - [![Docker Image Size (tag)](https://img.shields.io/docker/image-size/yama07/docker-ubuntu-lxde/22.04-xrdp_ja?style=flat-square)](https://hub.docker.com/r/yama07/docker-ubuntu-lxde/tags?name=22.04-xrdp_ja)
   `22.04-xrdp_ja`, `jammy-xrdp_ja`, `latest-xrdp`, `latest`: Ubuntu22.04 ベース [(xrdp/Dockerfile.ubuntu22.04)](https://github.com/yama07/docker-ubuntu-lxde/blob/master/xrdp/Dockerfile.ubuntu22.04)
 - [![Docker Image Size (tag)](https://img.shields.io/docker/image-size/yama07/docker-ubuntu-lxde/22.04-xrdp-slim_ja?style=flat-square)](https://hub.docker.com/r/yama07/docker-ubuntu-lxde/tags?name=22.04-xrdp-slim_ja)

diff --git a/xrdp/Dockerfile.ubuntu24.04_audio b/xrdp/Dockerfile.ubuntu24.04_audio
@@ -0,0 +1,11 @@
+FROM yama07/docker-ubuntu-lxde:24.04-xrdp_ja
+
+RUN \
+    # Disable unavailable pipewire features
+    sed -i -r 's/^( *module.jackdbus-detect = )true$/\1false/' /usr/share/pipewire/pipewire.conf \
+    # Launch the audio server before starting LXQt session
+    && sed -i \
+      -e "/startlxqt/iDISABLE_RTKIT=true PIPEWIRE_LOG_SYSTEMD=false pipewire &" \
+      -e "/startlxqt/iDISABLE_RTKIT=true PIPEWIRE_LOG_SYSTEMD=false pipewire-pulse &" \
+      -e "/startlxqt/iDISABLE_RTKIT=true PIPEWIRE_LOG_SYSTEMD=false wireplumber &" \
+      /etc/skel/.xsession
diff --git a/xrdp/Dockerfile.ubuntu24.04_pulseaudio b/xrdp/Dockerfile.ubuntu24.04_pulseaudio
diff --git a/xrdp/README.md b/xrdp/README.md
@@ -15,11 +15,11 @@ Docker による Ubuntu の LXDE/LXQt デスクトップ環境です。
 ## Supported tags
 
 - [![Docker Image Size (tag)](https://img.shields.io/docker/image-size/yama07/docker-ubuntu-lxde/24.04-xrdp_ja?style=flat-square)](https://hub.docker.com/r/yama07/docker-ubuntu-lxde/tags?name=24.04-xrdp_ja)
-  `24.04-xrdp_ja`, `noble-xrdp_ja`: Ubuntu24.04 ベース [(xrdp/Dockerfile.ubuntu24.04)](https://github.com/yama07/docker-ubuntu-lxde/blob/master/xrdp/Dockerfile.ubuntu24.04)
+  `24.04-xrdp_ja`, `noble-xrdp_ja`: Ubuntu24.04 ベース LXQt [(xrdp/Dockerfile.ubuntu24.04)](https://github.com/yama07/docker-ubuntu-lxde/blob/master/xrdp/Dockerfile.ubuntu24.04)
 - [![Docker Image Size (tag)](https://img.shields.io/docker/image-size/yama07/docker-ubuntu-lxde/24.04-xrdp-slim_ja?style=flat-square)](https://hub.docker.com/r/yama07/docker-ubuntu-lxde/tags?name=24.04-xrdp-slim_ja)
-  `24.04-xrdp-slim_ja`, `noble-xrdp-slim_ja`: サイズを軽量化した Ubuntu24.04 ベース [(xrdp/Dockerfile.ubuntu24.04)](https://github.com/yama07/docker-ubuntu-lxde/blob/master/xrdp/Dockerfile.ubuntu24.04)
-- [![Docker Image Size (tag)](https://img.shields.io/docker/image-size/yama07/docker-ubuntu-lxde/24.04-xrdp-pulseaudio_ja?style=flat-square)](https://hub.docker.com/r/yama07/docker-ubuntu-lxde/tags?name=24.04-xrdp-pulseaudio_ja)
-  `24.04-xrdp-pulseaudio_ja`, `noble-xrdp-pulseaudio_ja`: 音声転送可能な Ubuntu24.04 ベース [(xrdp/Dockerfile.ubuntu24.04_pulseaudio)](https://github.com/yama07/docker-ubuntu-lxde/blob/master/xrdp/Dockerfile.ubuntu24.04_pulseaudio)
+  `24.04-xrdp-slim_ja`, `noble-xrdp-slim_ja`: サイズを軽量化した Ubuntu24.04 ベース LXQt [(xrdp/Dockerfile.ubuntu24.04)](https://github.com/yama07/docker-ubuntu-lxde/blob/master/xrdp/Dockerfile.ubuntu24.04)
+- [![Docker Image Size (tag)](https://img.shields.io/docker/image-size/yama07/docker-ubuntu-lxde/24.04-xrdp-audio_ja?style=flat-square)](https://hub.docker.com/r/yama07/docker-ubuntu-lxde/tags?name=24.04-xrdp-audio_ja)
+  `24.04-xrdp-audio_ja`, `noble-xrdp-audio_ja`: 音声転送可能な Ubuntu24.04 ベース LXQt [(xrdp/Dockerfile.ubuntu24.04_audio)](https://github.com/yama07/docker-ubuntu-lxde/blob/master/xrdp/Dockerfile.ubuntu24.04_audio)
 - [![Docker Image Size (tag)](https://img.shields.io/docker/image-size/yama07/docker-ubuntu-lxde/22.04-xrdp_ja?style=flat-square)](https://hub.docker.com/r/yama07/docker-ubuntu-lxde/tags?name=22.04-xrdp_ja)
   `22.04-xrdp_ja`, `jammy-xrdp_ja`, `latest-xrdp`, `latest`: Ubuntu22.04 ベース [(xrdp/Dockerfile.ubuntu22.04)](https://github.com/yama07/docker-ubuntu-lxde/blob/master/xrdp/Dockerfile.ubuntu22.04)
 - [![Docker Image Size (tag)](https://img.shields.io/docker/image-size/yama07/docker-ubuntu-lxde/22.04-xrdp-slim_ja?style=flat-square)](https://hub.docker.com/r/yama07/docker-ubuntu-lxde/tags?name=22.04-xrdp-slim_ja)