Merge pull request #14 from linuxserver/queue

Add queue service

Dockerfile

@@ -31,6 +31,9 @@ RUN \
  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

@@ -34,6 +34,9 @@ RUN \
  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

@@ -34,6 +34,9 @@ RUN \
  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/*

Jenkinsfile

@@ -113,9 +113,6 @@ pipeline {
     stage("Set ENV live build"){
       when {
         branch "master"
-        expression {
-          env.LS_RELEASE != env.EXT_RELEASE + '-pkg-' + env.PACKAGE_TAG + '-ls' + env.LS_TAG_NUMBER
-        }
         environment name: 'CHANGE_ID', value: ''
       }
       steps {

README.md

@@ -12,7 +12,7 @@ Find us at:
 * [Discord](https://discord.gg/YWrKVTn) - realtime support / chat with the community and the team.
 * [IRC](https://irc.linuxserver.io) - on freenode at `#linuxserver.io`. Our primary support channel is Discord.
 * [Blog](https://blog.linuxserver.io) - all the things you can do with our containers including How-To guides, opinions and much more!
-* [Podcast](https://podcast.linuxserver.io) - on hiatus. Coming back soon (late 2018).
+* [Podcast](https://anchor.fm/linuxserverio) - on hiatus. Coming back soon (late 2018).
 
 # PSA: Changes are happening
 
@@ -136,6 +136,10 @@ This image now supports password protection through htpasswd. Run the following
 
 ## Versions
 
+* **31.10.18:** - Add queue service.
+* **17.10.18:** - Symlink avatars folder.
+* **16.10.18:** - Updated fastcgi_params for user login support.
+* **07.10.18:** - Symlink `.env` rather than copy. It now resides under `/config/www`
 * **30.09.18:** - Multi-arch image. Move `.env` to `/config`.
 * **05.09.18:** - Rebase to alpine linux 3.8.
 * **06.03.18:** - Use password protection if htpasswd is set. Existing users can delete their default site config at /config/nginx/site-confs/default and restart the container, a new default site config with htpasswd support will be created in its place

readme-vars.yml

@@ -47,6 +47,10 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "31.10.18:", desc: "Add queue service." }
+  - { date: "17.10.18:", desc: "Symlink avatars folder." }
+  - { date: "16.10.18:", desc: "Updated fastcgi_params for user login support." }
+  - { date: "07.10.18:", desc: "Symlink `.env` rather than copy. It now resides under `/config/www`" }
   - { date: "30.09.18:", desc: "Multi-arch image. Move `.env` to `/config`." }
   - { date: "05.09.18:", desc: "Rebase to alpine linux 3.8." }
   - { date: "06.03.18:", desc: "Use password protection if htpasswd is set. Existing users can delete their default site config at /config/nginx/site-confs/default and restart the container, a new default site config with htpasswd support will be created in its place" }

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

@@ -2,14 +2,22 @@
 
 # make our folders
 mkdir -p \
-	/config/www/{backgrounds,icons}
+	/config/www/{backgrounds,icons,avatars}
+
+# copy .env if not exists
+[[ ! -f /config/www/.env ]] && \
+  cp /var/www/localhost/heimdall/.env /config/www/.env
+# set queue driver to database
+sed -i 's/QUEUE_DRIVER=sync/QUEUE_DRIVER=database/' /config/www/.env
 
 # create symlinks
 
 symlinks=( \
+/var/www/localhost/heimdall/storage/app/public/avatars \
 /var/www/localhost/heimdall/storage/app/public/backgrounds \
 /var/www/localhost/heimdall/storage/app/public/icons \
-/var/www/localhost/heimdall/database/app.sqlite )
+/var/www/localhost/heimdall/database/app.sqlite \
+/var/www/localhost/heimdall/.env )
 
 for i in "${symlinks[@]}"
 do
@@ -17,11 +25,6 @@ do
 [[ ! -L "$i" ]] && ln -s /config/www/"$(basename "$i")" "$i"
 done
 
-# sync .env
-[[ ! -f /config/.env ]] && \
-  cp /var/www/localhost/heimdall/.env /config/.env
-cp /config/.env /var/www/localhost/heimdall/.env
-
 # permissions
 chown -R abc:abc \
 	/config \

root/etc/services.d/queue/run

@@ -0,0 +1,4 @@
+#!/usr/bin/with-contenv bash
+
+exec \
+       s6-setuidgid abc php /var/www/localhost/heimdall/artisan queue:work database --sleep=3 --tries=3