Merge pull request #3 from linuxserver/dockerfile-updates

CHBMB · web-flow · commit 48047ab5225f · 2018-07-13T20:29:47.000+01:00
fixed broken echo lines and now using thelamer github release logic
diff --git a/Dockerfile.aarch64 b/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"
 
@@ -26,6 +27,7 @@ apk add --no-cache  \
     php7-mysqlnd \
     php7-tidy \
     php7-simplexml \
+    php7-ctype \
     tar && \
 
 echo "**** configure php-fpm to pass env vars ****" && \
@@ -36,14 +38,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 +62,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 --git a/Dockerfile.amd64 b/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"
 
@@ -25,6 +24,7 @@ apk add --no-cache  \
     php7-mysqlnd \
     php7-tidy \
     php7-simplexml \
+    php7-ctype \
     tar && \
 
 echo "**** configure php-fpm to pass env vars ****" && \
@@ -35,14 +35,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 +59,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 --git a/Dockerfile.armhf b/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"
 
@@ -26,6 +27,7 @@ apk add --no-cache  \
     php7-mysqlnd \
     php7-tidy \
     php7-simplexml \
+    php7-ctype \
     tar && \
 
 echo "**** configure php-fpm to pass env vars ****" && \
@@ -36,14 +38,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 +62,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 --git a/Jenkinsfile b/Jenkinsfile
@@ -495,8 +495,8 @@ pipeline {
           sh "docker manifest annotate ${DOCKERHUB_IMAGE}:${EXT_RELEASE}-ls${LS_TAG_NUMBER} ${DOCKERHUB_IMAGE}:arm32v6-${EXT_RELEASE}-ls${LS_TAG_NUMBER} --os linux --arch arm"
           sh "docker manifest annotate ${DOCKERHUB_IMAGE}:${EXT_RELEASE}-ls${LS_TAG_NUMBER} ${DOCKERHUB_IMAGE}:arm64v8-${EXT_RELEASE}-ls${LS_TAG_NUMBER} --os linux --arch arm64 --variant armv8"
           echo 'Pushing by manifest tags'
-          sh "docker manifest push ${DOCKERHUB_IMAGE}:latest"
-          sh "docker manifest push ${DOCKERHUB_IMAGE}:${EXT_RELEASE}-ls${LS_TAG_NUMBER}"
+          sh "docker manifest push --purge ${DOCKERHUB_IMAGE}:latest"
+          sh "docker manifest push --purge ${DOCKERHUB_IMAGE}:${EXT_RELEASE}-ls${LS_TAG_NUMBER}"
         }
       }
     }
@@ -717,8 +717,8 @@ pipeline {
           sh "docker manifest annotate ${DEV_DOCKERHUB_IMAGE}:${EXT_RELEASE}-pkg-${PACKAGE_TAG}-dev-${COMMIT_SHA} ${DEV_DOCKERHUB_IMAGE}:arm32v6-${EXT_RELEASE}-pkg-${PACKAGE_TAG}-dev-${COMMIT_SHA} --os linux --arch arm"
           sh "docker manifest annotate ${DEV_DOCKERHUB_IMAGE}:${EXT_RELEASE}-pkg-${PACKAGE_TAG}-dev-${COMMIT_SHA} ${DEV_DOCKERHUB_IMAGE}:arm64v8-${EXT_RELEASE}-pkg-${PACKAGE_TAG}-dev-${COMMIT_SHA} --os linux --arch arm64 --variant armv8"
           echo 'Pushing by manifest tags'
-          sh "docker manifest push ${DEV_DOCKERHUB_IMAGE}:latest"
-          sh "docker manifest push ${DEV_DOCKERHUB_IMAGE}:${EXT_RELEASE}-pkg-${PACKAGE_TAG}-dev-${COMMIT_SHA}"
+          sh "docker manifest push --purge ${DEV_DOCKERHUB_IMAGE}:latest"
+          sh "docker manifest push --purge ${DEV_DOCKERHUB_IMAGE}:${EXT_RELEASE}-pkg-${PACKAGE_TAG}-dev-${COMMIT_SHA}"
         }
         script{
           env.DOCKERHUB_LINK = sh(
@@ -815,8 +815,8 @@ pipeline {
           sh "docker manifest annotate ${PR_DOCKERHUB_IMAGE}:${EXT_RELEASE}-pkg-${PACKAGE_TAG}-pr-${PULL_REQUEST} ${PR_DOCKERHUB_IMAGE}:arm32v6-${EXT_RELEASE}-pkg-${PACKAGE_TAG}-pr-${PULL_REQUEST} --os linux --arch arm"
           sh "docker manifest annotate ${PR_DOCKERHUB_IMAGE}:${EXT_RELEASE}-pkg-${PACKAGE_TAG}-pr-${PULL_REQUEST} ${PR_DOCKERHUB_IMAGE}:arm64v8-${EXT_RELEASE}-pkg-${PACKAGE_TAG}-pr-${PULL_REQUEST} --os linux --arch arm64 --variant armv8"
           echo 'Pushing by manifest tags'
-          sh "docker manifest push ${PR_DOCKERHUB_IMAGE}:latest"
-          sh "docker manifest push ${PR_DOCKERHUB_IMAGE}:${EXT_RELEASE}-pkg-${PACKAGE_TAG}-pr-${PULL_REQUEST}"
+          sh "docker manifest push --purge ${PR_DOCKERHUB_IMAGE}:latest"
+          sh "docker manifest push --purge ${PR_DOCKERHUB_IMAGE}:${EXT_RELEASE}-pkg-${PACKAGE_TAG}-pr-${PULL_REQUEST}"
         }
         script{
           env.CODE_URL = sh(
diff --git a/qemu-aarch64-static b/qemu-aarch64-static
diff --git a/qemu-arm-static b/qemu-arm-static
diff --git a/root/etc/cont-init.d/50-config b/root/etc/cont-init.d/50-config
@@ -34,7 +34,7 @@ sed -i "s/DB_HOST=localhost/DB_HOST=${DB_HOST}/g" /var/www/html/.env
 
 sed -i "s/DB_DATABASE=database_database/DB_DATABASE=${DB_DATABASE}/g" /var/www/html/.env
 
-sed -i "s/DB_USERNAME=database_username/DB_USER=${DB_USER}/g" /var/www/html/.env
+sed -i "s/DB_USERNAME=database_username/DB_USERNAME=${DB_USER}/g" /var/www/html/.env
 
 sed -i "s/DB_PASSWORD=database_user_password/DB_PASSWORD=${DB_PASS}/g" /var/www/html/.env
 
