From 95ea079f4d8617f21de6cc95adaa58f9f27792d5 Mon Sep 17 00:00:00 2001
From: t3chn0m4g3 <t3chn0m4g3@gmail.com>
Date: Mon, 15 Feb 2021 11:00:00 +0000
Subject: [PATCH] rebuild heimdall, nginx for php7.4, alpine 3.13

---
 docker/heimdall/Dockerfile | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/docker/heimdall/Dockerfile b/docker/heimdall/Dockerfile
index f3d01ab9..b9f10dfa 100644
--- a/docker/heimdall/Dockerfile
+++ b/docker/heimdall/Dockerfile
@@ -1,11 +1,10 @@
-FROM alpine:3.12
+FROM alpine:3.13
 #
 # Include dist
 ADD dist/ /root/dist/
 #
 # Get and install dependencies & packages
-RUN sed -i 's/dl-cdn/dl-2/g' /etc/apk/repositories && \
-    apk -U --no-cache add \
+RUN apk -U --no-cache add \
       git \
       nginx \
       nginx-mod-http-headers-more \
@@ -29,13 +28,15 @@ RUN sed -i 's/dl-cdn/dl-2/g' /etc/apk/repositories && \
 # Clone and setup Heimdall, Nginx
     git clone https://github.com/linuxserver/heimdall && \
     cd heimdall && \
-    git checkout 3a9bdd2c431d70803b259990fa4d81db4b06dba4 && \
+    git checkout 61a5a1a8b023771e0ff7c056add5537d20737e51 && \
     cd .. && \
     cp -R heimdall/. /var/lib/nginx/html && \
     rm -rf heimdall && \
     cd /var/lib/nginx/html && \
     cp .env.example .env && \
-    php artisan key:generate && \
+    # Fix error for ArrayInput in smyfony with regard to PHP7.4 (https://github.com/symfony/symfony/pull/32806/files)
+    sed -i "135s/.*/} elseif (0 === strpos(\$key, '-')) {/" /var/lib/nginx/html/vendor/symfony/console/Input/ArrayInput.php && \
+    php7 artisan key:generate && \
 #
 ## Add previously configured content
     mkdir -p /var/lib/nginx/html/storage/app/public/backgrounds/ && \