From b9940034b8ac1246813a0c17ebd41671fab7edef Mon Sep 17 00:00:00 2001
From: Eric Nemchik <eric@nemchik.com>
Date: Mon, 23 Jan 2023 19:50:44 -0600
Subject: [PATCH] Move install back to Dockerfile

---
 Dockerfile                                    | 15 +++++++++++++-
 Dockerfile.aarch64                            | 15 +++++++++++++-
 Dockerfile.armhf                              | 15 +++++++++++++-
 .../s6-rc.d/init-heimdall-config/run          | 20 ++-----------------
 4 files changed, 44 insertions(+), 21 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4e56c82..7269b97 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,6 +23,11 @@ RUN \
     php81-pdo_mysql \
     php81-tokenizer \
     php81-zip && \
+  echo "**** configure nginx ****" && \
+  echo 'fastcgi_param  PHP_AUTH_USER      $remote_user; # Heimdall user authorization' >> \
+    /etc/nginx/fastcgi_params && \
+  echo 'fastcgi_param  PHP_AUTH_PW        $http_authorization; # Heimdall user authorization' >> \
+    /etc/nginx/fastcgi_params && \
   echo "**** install heimdall ****" && \
   mkdir -p \
     /heimdall && \
@@ -31,8 +36,16 @@ RUN \
     | awk '/tag_name/{print $4;exit}' FS='[""]'); \
   fi && \
   curl -o \
-    /heimdall/heimdall.tar.gz -L \
+    /tmp/heimdall.tar.gz -L \
     "https://github.com/linuxserver/Heimdall/archive/${HEIMDALL_RELEASE}.tar.gz" && \
+  mkdir -p \
+    /app/www && \
+  tar xf \
+    /tmp/heimdall.tar.gz -C \
+    /app/www --strip-components=1 && \
+  cp /app/www/storage/app/searchproviders.yaml /app/www/storage/app/searchproviders.yaml.orig && \
+  chown -R abc:abc \
+    /app/www && \
   echo "**** cleanup ****" && \
   rm -rf \
     /tmp/*
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 2411550..07e2312 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -23,6 +23,11 @@ RUN \
     php81-pdo_mysql \
     php81-tokenizer \
     php81-zip && \
+  echo "**** configure nginx ****" && \
+  echo 'fastcgi_param  PHP_AUTH_USER      $remote_user; # Heimdall user authorization' >> \
+    /etc/nginx/fastcgi_params && \
+  echo 'fastcgi_param  PHP_AUTH_PW        $http_authorization; # Heimdall user authorization' >> \
+    /etc/nginx/fastcgi_params && \
   echo "**** install heimdall ****" && \
   mkdir -p \
     /heimdall && \
@@ -31,8 +36,16 @@ RUN \
     | awk '/tag_name/{print $4;exit}' FS='[""]'); \
   fi && \
   curl -o \
-    /heimdall/heimdall.tar.gz -L \
+    /tmp/heimdall.tar.gz -L \
     "https://github.com/linuxserver/Heimdall/archive/${HEIMDALL_RELEASE}.tar.gz" && \
+  mkdir -p \
+    /app/www && \
+  tar xf \
+    /tmp/heimdall.tar.gz -C \
+    /app/www --strip-components=1 && \
+  cp /app/www/storage/app/searchproviders.yaml /app/www/storage/app/searchproviders.yaml.orig && \
+  chown -R abc:abc \
+    /app/www && \
   echo "**** cleanup ****" && \
   rm -rf \
     /tmp/*
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index 7739e88..d4d4a52 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -23,6 +23,11 @@ RUN \
     php81-pdo_mysql \
     php81-tokenizer \
     php81-zip && \
+  echo "**** configure nginx ****" && \
+  echo 'fastcgi_param  PHP_AUTH_USER      $remote_user; # Heimdall user authorization' >> \
+    /etc/nginx/fastcgi_params && \
+  echo 'fastcgi_param  PHP_AUTH_PW        $http_authorization; # Heimdall user authorization' >> \
+    /etc/nginx/fastcgi_params && \
   echo "**** install heimdall ****" && \
   mkdir -p \
     /heimdall && \
@@ -31,8 +36,16 @@ RUN \
     | awk '/tag_name/{print $4;exit}' FS='[""]'); \
   fi && \
   curl -o \
-    /heimdall/heimdall.tar.gz -L \
+    /tmp/heimdall.tar.gz -L \
     "https://github.com/linuxserver/Heimdall/archive/${HEIMDALL_RELEASE}.tar.gz" && \
+  mkdir -p \
+    /app/www && \
+  tar xf \
+    /tmp/heimdall.tar.gz -C \
+    /app/www --strip-components=1 && \
+  cp /app/www/storage/app/searchproviders.yaml /app/www/storage/app/searchproviders.yaml.orig && \
+  chown -R abc:abc \
+    /app/www && \
   echo "**** cleanup ****" && \
   rm -rf \
     /tmp/*
diff --git a/root/etc/s6-overlay/s6-rc.d/init-heimdall-config/run b/root/etc/s6-overlay/s6-rc.d/init-heimdall-config/run
index 1bcb0c6..345b6dc 100755
--- a/root/etc/s6-overlay/s6-rc.d/init-heimdall-config/run
+++ b/root/etc/s6-overlay/s6-rc.d/init-heimdall-config/run
@@ -4,20 +4,8 @@
 # make our folders
 mkdir -p \
     /config/www/{avatars,backgrounds,icons,logs,SupportedApps} \
-    /app/www \
     /config/log/heimdall
 
-# install heimdall if necessary
-if [[ -f /heimdall/heimdall.tar.gz ]]; then
-    echo "New container detected, installing Heimdall"
-    tar xf \
-        /heimdall/heimdall.tar.gz -C \
-        /app/www --strip-components=1
-    echo -e '\n# Heimdall user authorization\nfastcgi_param  PHP_AUTH_USER $remote_user;\nfastcgi_param  PHP_AUTH_PW $http_authorization;' >> \
-        /etc/nginx/fastcgi_params
-    cp /app/www/storage/app/searchproviders.yaml /app/www/storage/app/searchproviders.yaml.orig
-fi
-
 # create symlinks
 symlinks=(
     /app/www/storage/app/public/avatars
@@ -35,21 +23,17 @@ for i in "${symlinks[@]}"; do
     if [[ ! -L "${i}" ]]; then
         ln -s /config/www/"$(basename "${i}")" "${i}"
     fi
+    lsiown -R abc:abc /config/www/"$(basename "${i}")"
 done
 
 # copy searchproviders if not exists and symlink
 if [[ ! -f /config/www/searchproviders.yaml ]]; then
     cp /app/www/storage/app/searchproviders.yaml.orig /config/www/searchproviders.yaml
+    lsiown -R abc:abc /config/www/searchproviders.yaml
 fi
 rm -rf /app/www/storage/app/searchproviders.yaml
 ln -s /config/www/searchproviders.yaml /app/www/storage/app/searchproviders.yaml
 
-# tidy up install files & set permissions
-if [[ -f /heimdall/heimdall.tar.gz ]]; then
-    rm -rf /heimdall
-    lsiown -R abc:abc /config
-fi
-
 # copy .env if not exists
 if [[ ! -f /config/www/.env ]]; then
     install -g abc -o abc /app/www/.env.example /config/www/.env