From a11d38de0fd6ff1474a950ab1790b866b403c981 Mon Sep 17 00:00:00 2001
From: djl <djl@users.noreply.github.com>
Date: Wed, 2 Feb 2022 19:57:13 +0000
Subject: [PATCH] Use Python 3. (#53)

---
 Dockerfile                         | 6 ++++--
 Dockerfile.aarch64                 | 6 ++++--
 Dockerfile.armhf                   | 6 ++++--
 readme-vars.yml                    | 1 +
 root/etc/services.d/headphones/run | 2 +-
 5 files changed, 14 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/readme-vars.yml b/readme-vars.yml
index 32b4344..9420c34 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -79,6 +79,7 @@ app_setup_nginx_reverse_proxy_block: "Access WebUI at `<your-ip>:8181` and walk
 # changelog
 
 changelogs:
+  - { date: "02.02.22:", desc: "Rebasing to alpine 3.15. Updating to Python 3." }
   - { date: "19.12.19:", desc: "Rebasing to alpine 3.11." }
   - { date: "28.06.19:", desc: "Rebasing to alpine 3.10." }
   - { date: "09.05.19:", desc: "Add default UTC timezone if user does not set it." }
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