Merge branch 'dockerfile-updates' of https://github.com/linuxserver/docker-bookstack into dockerfile-updates

Author: Homerr

Diff for: Dockerfile.aarch64

@@ -7,6 +7,7 @@ COPY qemu-aarch64-static /usr/bin
 # set version label
 ARG BUILD_DATE
 ARG VERSION
+ARG BOOKSTACK_RELEASE
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="homerr"
 
@@ -36,14 +37,17 @@ echo "**** configure php-fpm to pass env vars ****" && \
 
 echo "**** get bookstack ****" && \
 
-BSAPP_VER="$(curl -sX GET https://api.github.com/repos/BookStackApp/BookStack/releases/latest | grep 'tag_name' | cut -d\" -f4)" && \
-
 mkdir -p\
     /var/www/html && \
 
+if [ -z ${BOOKSTACK_RELEASE+x} ]; then \
+        	BOOKSTACK_RELEASE=$(curl -sX GET "https://api.github.com/repos/bookstackapp/bookstack/releases/latest" \
+          | awk '/tag_name/{print $4;exit}' FS='[""]'); \
+fi && \
+
 curl -o \
-/tmp/bookstack.tar.gz -L \
-    "https://github.com/BookStackApp/BookStack/archive/${BSAPP_VER}.tar.gz" && \
+    /tmp/bookstack.tar.gz -L \
+    "https://github.com/BookStackApp/BookStack/archive/${BOOKSTACK_RELEASE}.tar.gz" && \
 
 tar xf \
 /tmp/bookstack.tar.gz -C \
@@ -57,7 +61,7 @@ cd /tmp && \
     curl -sS https://getcomposer.org/installer | php && \
     mv /tmp/composer.phar /usr/local/bin/composer && \
 
-echo "**** run composer install ****"
+echo "**** run composer install ****" && \
 
 composer install -d /var/www/html/ && \
 

Diff for: Dockerfile.amd64

@@ -1,11 +1,10 @@
-# using ideas/code from other sparklyballs templates
-# set variable to get archive based on github api data (sparklyballs heimdall inspiration)
-
+# using ideas/code from other thelamer & sparklyballs lsio templates
 FROM lsiobase/alpine.nginx:3.7
 
 # set version label
 ARG BUILD_DATE
 ARG VERSION
+ARG BOOKSTACK_RELEASE
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="homerr"
 
@@ -35,14 +34,17 @@ echo "**** configure php-fpm to pass env vars ****" && \
 
 echo "**** get bookstack ****" && \
 
-BSAPP_VER="$(curl -sX GET https://api.github.com/repos/BookStackApp/BookStack/releases/latest | grep 'tag_name' | cut -d\" -f4)" && \
-
 mkdir -p\
     /var/www/html && \
 
+if [ -z ${BOOKSTACK_RELEASE+x} ]; then \
+    	BOOKSTACK_RELEASE=$(curl -sX GET "https://api.github.com/repos/bookstackapp/bookstack/releases/latest" \
+      | awk '/tag_name/{print $4;exit}' FS='[""]'); \
+fi && \
+
 curl -o \
 /tmp/bookstack.tar.gz -L \
-    "https://github.com/BookStackApp/BookStack/archive/${BSAPP_VER}.tar.gz" && \
+    "https://github.com/BookStackApp/BookStack/archive/${BOOKSTACK_RELEASE}.tar.gz" && \
 
 tar xf \
 /tmp/bookstack.tar.gz -C \
@@ -56,7 +58,7 @@ cd /tmp && \
     curl -sS https://getcomposer.org/installer | php && \
     mv /tmp/composer.phar /usr/local/bin/composer && \
 
-echo "**** run composer install ****"
+echo "**** run composer install ****" && \
 
 composer install -d /var/www/html/ && \
 

Diff for: Dockerfile.armhf

@@ -7,6 +7,7 @@ COPY qemu-arm-static /usr/bin
 # set version label
 ARG BUILD_DATE
 ARG VERSION
+ARG BOOKSTACK_RELEASE
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="homerr"
 
@@ -36,14 +37,17 @@ echo "**** configure php-fpm to pass env vars ****" && \
 
 echo "**** get bookstack ****" && \
 
-BSAPP_VER="$(curl -sX GET https://api.github.com/repos/BookStackApp/BookStack/releases/latest | grep 'tag_name' | cut -d\" -f4)" && \
-
 mkdir -p\
     /var/www/html && \
 
+if [ -z ${BOOKSTACK_RELEASE+x} ]; then \
+        	BOOKSTACK_RELEASE=$(curl -sX GET "https://api.github.com/repos/bookstackapp/bookstack/releases/latest" \
+          | awk '/tag_name/{print $4;exit}' FS='[""]'); \
+fi && \
+
 curl -o \
-/tmp/bookstack.tar.gz -L \
-    "https://github.com/BookStackApp/BookStack/archive/${BSAPP_VER}.tar.gz" && \
+    /tmp/bookstack.tar.gz -L \
+    "https://github.com/BookStackApp/BookStack/archive/${BOOKSTACK_RELEASE}.tar.gz" && \
 
 tar xf \
 /tmp/bookstack.tar.gz -C \
@@ -57,7 +61,7 @@ cd /tmp && \
     curl -sS https://getcomposer.org/installer | php && \
     mv /tmp/composer.phar /usr/local/bin/composer && \
 
-echo "**** run composer install ****"
+echo "**** run composer install ****" && \
 
 composer install -d /var/www/html/ && \