From a6ae540dc0e2e6a156338012e59d61240c89cdc4 Mon Sep 17 00:00:00 2001
From: aptalca <aptalca@users.noreply.github.com>
Date: Sat, 2 Apr 2022 13:24:44 -0400
Subject: [PATCH] rebase to 3.15, fix ffmpeg download

---
 Dockerfile                     | 2 +-
 Dockerfile.aarch64             | 2 +-
 Dockerfile.armhf               | 2 +-
 README.md                      | 1 +
 readme-vars.yml                | 1 +
 root/etc/cont-init.d/30-config | 3 ++-
 6 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 2b384ba..9e165e3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:3.13
+FROM ghcr.io/linuxserver/baseimage-alpine:3.15
 
 # set version label
 ARG BUILD_DATE
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 4c86927..f31c85b 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.13
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.15
 
 # set version label
 ARG BUILD_DATE
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index 4cafc01..d12b500 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.13
+FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.15
 
 # set version label
 ARG BUILD_DATE
diff --git a/README.md b/README.md
index 383c2fd..f0f2440 100644
--- a/README.md
+++ b/README.md
@@ -231,6 +231,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **02.04.22:** - Rebase to alpine 3.15. Fix ffmpeg download.
 * **17.05.21:** - Deprecating the env vars `USER`, `PASSWORD` and `USE_JSON` as mStream v5 requires the use of `config.json`.
 * **23.01.21:** - Rebasing to alpine 3.13.
 * **01.06.20:** - Rebasing to alpine 3.12.
diff --git a/readme-vars.yml b/readme-vars.yml
index e8d33c0..9973f54 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -37,6 +37,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "02.04.22:", desc: "Rebase to alpine 3.15. Fix ffmpeg download." }
   - { date: "17.05.21:", desc: "Deprecating the env vars `USER`, `PASSWORD` and `USE_JSON` as mStream v5 requires the use of `config.json`." }
   - { date: "23.01.21:", desc: "Rebasing to alpine 3.13." }
   - { date: "01.06.20:", desc: "Rebasing to alpine 3.12." }
diff --git a/root/etc/cont-init.d/30-config b/root/etc/cont-init.d/30-config
index 2000fd4..8060435 100644
--- a/root/etc/cont-init.d/30-config
+++ b/root/etc/cont-init.d/30-config
@@ -53,5 +53,6 @@ fi
 
 # permissions
 chown abc:abc -R \
-    /config 
+    /config \
+    /opt/mstream/bin
     
\ No newline at end of file