From b160e7db4ad8db7fd6469945a9572b510587daf1 Mon Sep 17 00:00:00 2001
From: David Logie <djl@mksh.org>
Date: Wed, 2 Feb 2022 16:40:27 +0000
Subject: [PATCH] Use Python 3.

Headphones recently merged Python 3 support to the master branch,
breaking the existing images.

Update the Dockerfiles to use baseimage-alpine image and
update the services to use Python 3.
---
 Dockerfile                         | 6 ++++--
 Dockerfile.aarch64                 | 6 ++++--
 Dockerfile.armhf                   | 6 ++++--
 root/etc/services.d/headphones/run | 2 +-
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index dac2635..6816a03 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine-python:3.11
+FROM ghcr.io/linuxserver/baseimage-alpine:3.15
 
 # set version label
 ARG BUILD_DATE
@@ -21,7 +21,9 @@ RUN \
  apk add --no-cache \
 	ffmpeg \
 	flac \
-	mc && \
+	git \
+	mc \
+	python3 && \
  echo "**** compile shntool *** *" && \
  mkdir -p \
 	/tmp/shntool && \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index f355067..e757821 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine-python:arm64v8-3.11
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.15
 
 # set version label
 ARG BUILD_DATE
@@ -21,7 +21,9 @@ RUN \
  apk add --no-cache \
 	ffmpeg \
 	flac \
-	mc && \
+	git \
+	mc \
+	python3 && \
  echo "**** compile shntool *** *" && \
  mkdir -p \
 	/tmp/shntool && \
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index 5f4b8f8..2445350 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine-python:arm32v7-3.11
+FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.15
 
 # set version label
 ARG BUILD_DATE
@@ -21,7 +21,9 @@ RUN \
  apk add --no-cache \
 	ffmpeg \
 	flac \
-	mc && \
+	git \
+	mc \
+	python3 && \
  echo "**** compile shntool *** *" && \
  mkdir -p \
 	/tmp/shntool && \
diff --git a/root/etc/services.d/headphones/run b/root/etc/services.d/headphones/run
index 1e00926..65af626 100644
--- a/root/etc/services.d/headphones/run
+++ b/root/etc/services.d/headphones/run
@@ -1,5 +1,5 @@
 #!/usr/bin/with-contenv bash
 
 exec \
-	s6-setuidgid abc python /app/headphones/Headphones.py \
+	s6-setuidgid abc python3 /app/headphones/Headphones.py \
 	--datadir=/config