Bot Updating Package Versions

persist laravel.log

Dockerfile

@@ -21,20 +21,14 @@ RUN \
 	tar && \
  echo "**** install heimdall ****" && \
  mkdir -p \
-	/var/www/localhost/heimdall && \
+	/heimdall && \
  if [ -z ${HEIMDALL_RELEASE+x} ]; then \
  	HEIMDALL_RELEASE=$(curl -sX GET "https://api.github.com/repos/linuxserver/Heimdall/commits/master" \
 	| awk '/sha/{print $4;exit}' FS='[""]'); \
  fi && \
  curl -o \
- /tmp/heimdall.tar.gz -L \
+	/heimdall/heimdall.tar.gz -L \
 	"https://github.com/linuxserver/Heimdall/archive/${HEIMDALL_RELEASE}.tar.gz" && \
- tar xf \
- /tmp/heimdall.tar.gz -C \
-	/var/www/localhost/heimdall --strip-components=1 && \
- echo "**** configure nginx ****" && \
- echo -e '\n# Heimdall user authorization\nfastcgi_param  PHP_AUTH_USER $remote_user;\nfastcgi_param  PHP_AUTH_PW $http_authorization;' >> \
-	/etc/nginx/fastcgi_params && \
  echo "**** cleanup ****" && \
  rm -rf \
 	/tmp/*

Dockerfile.aarch64

@@ -21,20 +21,14 @@ RUN \
 	tar && \
  echo "**** install heimdall ****" && \
  mkdir -p \
-	/var/www/localhost/heimdall && \
+	/heimdall && \
  if [ -z ${HEIMDALL_RELEASE+x} ]; then \
  	HEIMDALL_RELEASE=$(curl -sX GET "https://api.github.com/repos/linuxserver/Heimdall/commits/master" \
-        | awk '/sha/{print $4;exit}' FS='[""]'); \
+	| awk '/sha/{print $4;exit}' FS='[""]'); \
  fi && \
  curl -o \
- /tmp/heimdall.tar.gz -L \
+	/heimdall/heimdall.tar.gz -L \
 	"https://github.com/linuxserver/Heimdall/archive/${HEIMDALL_RELEASE}.tar.gz" && \
- tar xf \
- /tmp/heimdall.tar.gz -C \
-	/var/www/localhost/heimdall --strip-components=1 && \
- echo "**** configure nginx ****" && \
- echo -e '\n# Heimdall user authorization\nfastcgi_param  PHP_AUTH_USER $remote_user;\nfastcgi_param  PHP_AUTH_PW $http_authorization;' >> \
-        /etc/nginx/fastcgi_params && \
  echo "**** cleanup ****" && \
  rm -rf \
 	/tmp/*

Dockerfile.armhf

@@ -21,20 +21,14 @@ RUN \
 	tar && \
  echo "**** install heimdall ****" && \
  mkdir -p \
-	/var/www/localhost/heimdall && \
+	/heimdall && \
  if [ -z ${HEIMDALL_RELEASE+x} ]; then \
  	HEIMDALL_RELEASE=$(curl -sX GET "https://api.github.com/repos/linuxserver/Heimdall/commits/master" \
-        | awk '/sha/{print $4;exit}' FS='[""]'); \
+	| awk '/sha/{print $4;exit}' FS='[""]'); \
  fi && \
  curl -o \
- /tmp/heimdall.tar.gz -L \
+	/heimdall/heimdall.tar.gz -L \
 	"https://github.com/linuxserver/Heimdall/archive/${HEIMDALL_RELEASE}.tar.gz" && \
- tar xf \
- /tmp/heimdall.tar.gz -C \
-	/var/www/localhost/heimdall --strip-components=1 && \
- echo "**** configure nginx ****" && \
- echo -e '\n# Heimdall user authorization\nfastcgi_param  PHP_AUTH_USER $remote_user;\nfastcgi_param  PHP_AUTH_PW $http_authorization;' >> \
-        /etc/nginx/fastcgi_params && \
  echo "**** cleanup ****" && \
  rm -rf \
 	/tmp/*

README.md

@@ -194,6 +194,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **15.07.19:** - Save laravel.log to /config, install heimdall during first start.
 * **28.06.19:** - Rebasing to alpine 3.10.
 * **23.03.19:** - Switching to new Base images, shift to arm32v7 tag.
 * **22.02.19:** - Rebasing to alpine 3.9.

package_versions.txt

@@ -1,16 +1,17 @@
 alpine-baselayout-3.1.2-r0
 alpine-keys-2.1-r2
 apache2-utils-2.4.39-r0
-apk-tools-2.10.4-r1
+apk-tools-2.10.4-r2
 apr-1.6.5-r0
 apr-util-1.6.1-r6
+argon2-libs-20171227-r2
 bash-5.0.0-r0
 busybox-1.30.1-r2
 ca-certificates-20190108-r0
 ca-certificates-cacert-20190108-r0
 coreutils-8.31-r0
 curl-7.65.1-r0
-expat-2.2.6-r0
+expat-2.2.7-r0
 git-2.22.0-r0
 libacl-2.2.52-r6
 libattr-2.4.48-r0
@@ -28,33 +29,33 @@ libxml2-2.9.9-r2
 libzip-1.5.2-r0
 linux-pam-1.3.0-r1
 logrotate-3.15.0-r0
-musl-1.1.22-r2
-musl-utils-1.1.22-r2
+musl-1.1.22-r3
+musl-utils-1.1.22-r3
 nano-4.3-r0
 ncurses-libs-6.1_p20190518-r0
 ncurses-terminfo-6.1_p20190518-r0
 ncurses-terminfo-base-6.1_p20190518-r0
 nghttp2-libs-1.38.0-r0
-nginx-1.16.0-r2
+nginx-1.16.1-r0
 openssl-1.1.1c-r0
 pcre-8.43-r0
 pcre2-10.33-r0
-php7-7.3.6-r0
-php7-common-7.3.6-r0
-php7-ctype-7.3.7-r0
-php7-fileinfo-7.3.6-r0
-php7-fpm-7.3.6-r0
-php7-json-7.3.6-r0
-php7-mbstring-7.3.6-r0
-php7-openssl-7.3.6-r0
-php7-pdo-7.3.7-r0
-php7-pdo_sqlite-7.3.7-r0
-php7-session-7.3.6-r0
-php7-simplexml-7.3.6-r0
-php7-tokenizer-7.3.7-r0
-php7-xml-7.3.6-r0
-php7-xmlwriter-7.3.6-r0
-php7-zip-7.3.7-r0
+php7-7.3.8-r0
+php7-common-7.3.8-r0
+php7-ctype-7.3.8-r0
+php7-fileinfo-7.3.8-r0
+php7-fpm-7.3.8-r0
+php7-json-7.3.8-r0
+php7-mbstring-7.3.8-r0
+php7-openssl-7.3.8-r0
+php7-pdo-7.3.8-r0
+php7-pdo_sqlite-7.3.8-r0
+php7-session-7.3.8-r0
+php7-simplexml-7.3.8-r0
+php7-tokenizer-7.3.8-r0
+php7-xml-7.3.8-r0
+php7-xmlwriter-7.3.8-r0
+php7-zip-7.3.8-r0
 popt-1.16-r7
 readline-8.0.0-r0
 scanelf-1.2.3-r0

readme-vars.yml

@@ -52,6 +52,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "15.07.19:", desc: "Save laravel.log to /config, install heimdall during first start." }
   - { date: "28.06.19:", desc: "Rebasing to alpine 3.10." }
   - { date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag." }
   - { date: "22.02.19:", desc: "Rebasing to alpine 3.9." }

root/etc/cont-init.d/50-config

@@ -2,7 +2,20 @@
 
 # make our folders
 mkdir -p \
-	/config/www/{backgrounds,icons,avatars,SupportedApps}
+	/config/www/{backgrounds,icons,avatars,SupportedApps} \
+	/var/www/localhost/heimdall \
+	/config/log/heimdall
+
+# install heimdall if necessary
+[[ -f /heimdall/heimdall.tar.gz ]] && \
+ echo "New container detected, installing Heimdall" && \
+ tar xf \
+ 	/heimdall/heimdall.tar.gz -C \
+	/var/www/localhost/heimdall --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 && \
+ rm -rf /heimdall && \
+ chown -R abc:abc /var/www/localhost/heimdall
 
 # create symlinks
 
@@ -20,9 +33,15 @@ do
 [[ ! -L "$i" ]] && ln -s /config/www/"$(basename "$i")" "$i"
 done
 
+[[ -e "/var/www/localhost/heimdall/storage/logs/laravel.log" && ! -L "/var/www/localhost/heimdall/storage/logs/laravel.log" ]] \
+	&& rm -rf "/var/www/localhost/heimdall/storage/logs/laravel.log"
+[[ ! -L "/var/www/localhost/heimdall/storage/logs/laravel.log" ]] && \
+	ln -s "/config/log/heimdall/laravel.log" "/var/www/localhost/heimdall/storage/logs/laravel.log"
+
 # copy .env if not exists
 [[ ! -f /config/www/.env ]] && \
   cp /var/www/localhost/heimdall/.env.example /config/www/.env && \
+  echo "generating app key"
   php /var/www/localhost/heimdall/artisan key:generate
 # set queue driver to database
 sed -i 's/QUEUE_DRIVER=sync/QUEUE_DRIVER=database/' /config/www/.env

root/etc/logrotate.d/heimdall

@@ -0,0 +1,9 @@
+/config/log/heimdall/laravel.log {
+        size 5M
+        rotate 5
+        compress
+        nodateext
+        notifempty
+        missingok
+        su abc abc
+}