Merge pull request #20 from KodeStar/master

Add missing folder to mkdir

Dockerfile

@@ -17,6 +17,7 @@ RUN \
 	php7-ctype \
 	php7-pdo_sqlite \
 	php7-tokenizer \
+	php7-zip \
 	tar && \
  echo "**** install heimdall ****" && \
  mkdir -p \

Dockerfile.aarch64

@@ -20,6 +20,7 @@ RUN \
 	php7-ctype \
 	php7-pdo_sqlite \
 	php7-tokenizer \
+	php7-zip \
 	tar && \
  echo "**** install heimdall ****" && \
  mkdir -p \

Dockerfile.armhf

@@ -20,6 +20,7 @@ RUN \
 	php7-ctype \
 	php7-pdo_sqlite \
 	php7-tokenizer \
+	php7-zip \
 	tar && \
  echo "**** install heimdall ****" && \
  mkdir -p \

Jenkinsfile

@@ -2,7 +2,11 @@ pipeline {
   agent {
     label 'X86-64-MULTI'
   }
-  // Configuration for the variables used for this specific repo
+  // Input to determine if this is a package check
+  parameters {
+     string(defaultValue: 'false', description: 'package check run', name: 'PACKAGE_CHECK')
+  }
+  // Configuraiton for the variables used for this specific repo
   environment {
     EXT_GIT_BRANCH = 'master'
     EXT_USER = 'linuxserver'
@@ -16,12 +20,6 @@ pipeline {
     BUILDS_DISCORD = credentials('build_webhook_url')
     GITHUB_TOKEN = credentials('498b4638-2d02-4ce5-832d-8a57d01d97ab')
     DIST_IMAGE = 'alpine'
-    DIST_TAG = '3.8'
-    DIST_PACKAGES = 'curl \
-                    php7-ctype \
-                    php7-pdo_sqlite \
-                    php7-tokenizer \
-                    tar'
     MULTIARCH='true'
     CI='true'
     CI_WEB='true'
@@ -37,6 +35,7 @@ pipeline {
     stage("Set ENV Variables base"){
       steps{
         script{
+          env.EXIT_STATUS = ''
           env.LS_RELEASE = sh(
             script: '''curl -s https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases/latest | jq -r '. | .tag_name' ''',
             returnStdout: true).trim()
@@ -76,14 +75,21 @@ pipeline {
     /* #######################
        Package Version Tagging
        ####################### */
-    // If this is an alpine base image determine the base package tag to use
+    // Grab the current package versions in Git to determine package tag
-    stage("Set Package tag Alpine"){
+    stage("Set Package tag"){
       steps{
-        sh '''docker pull alpine:${DIST_TAG}'''
         script{
           env.PACKAGE_TAG = sh(
-            script: '''docker run --rm alpine:${DIST_TAG} sh -c 'apk update --quiet\
+            script: '''#!/bin/bash
-                       && apk info '"${DIST_PACKAGES}"' | md5sum | cut -c1-8' ''',
+                       http_code=$(curl --write-out %{http_code} -s -o /dev/null \
+                                   https://raw.githubusercontent.com/${LS_USER}/${LS_REPO}/master/package_versions.txt)
+                       if [[ "${http_code}" -ne 200 ]] ; then
+                         echo none
+                       else
+                         curl -s \
+                           https://raw.githubusercontent.com/${LS_USER}/${LS_REPO}/master/package_versions.txt \
+                         | md5sum | cut -c1-8
+                       fi''',
             returnStdout: true).trim()
         }
       }
@@ -165,85 +171,210 @@ pipeline {
         }
       }
     }
+    // Use helper container to render a readme from the template if needed
+    stage('Update-README') {
+      when {
+        branch "master"
+        environment name: 'CHANGE_ID', value: ''
+        expression {
+          env.CONTAINER_NAME != null
+        }
+      }
+      steps {
+        sh '''#! /bin/bash
+              TEMPDIR=$(mktemp -d)
+              docker pull linuxserver/doc-builder:latest
+              docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -v ${TEMPDIR}:/ansible/readme linuxserver/doc-builder:latest
+              if [ "$(md5sum ${TEMPDIR}/${CONTAINER_NAME}/README.md | awk '{ print $1 }')" != "$(md5sum README.md | awk '{ print $1 }')" ]; then
+                git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/${LS_REPO}
+                cp ${TEMPDIR}/${CONTAINER_NAME}/README.md ${TEMPDIR}/${LS_REPO}/
+                cd ${TEMPDIR}/${LS_REPO}/
+                git --git-dir ${TEMPDIR}/${LS_REPO}/.git add README.md
+                git --git-dir ${TEMPDIR}/${LS_REPO}/.git commit -m 'Bot Updating README from template'
+                git --git-dir ${TEMPDIR}/${LS_REPO}/.git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
+                echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
+              else
+                echo "false" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
+              fi
+              rm -Rf ${TEMPDIR}'''
+        script{
+          env.README_UPDATED = sh(
+            script: '''cat /tmp/${COMMIT_SHA}-${BUILD_NUMBER}''',
+            returnStdout: true).trim()
+        }
+      }
+    }
+    // Exit the build if the Readme was just updated
+    stage('README-exit') {
+      when {
+        branch "master"
+        environment name: 'CHANGE_ID', value: ''
+        environment name: 'README_UPDATED', value: 'true'
+        expression {
+          env.CONTAINER_NAME != null
+        }
+      }
+      steps {
+        script{
+          env.EXIT_STATUS = 'ABORTED'
+        }
+      }
+    }
     /* ###############
        Build Container
        ############### */
-     // Build Docker container for push to LS Repo
+    // Build Docker container for push to LS Repo
-     stage('Build-Single') {
+    stage('Build-Single') {
-       when {
+      when {
-         environment name: 'MULTIARCH', value: 'false'
+        environment name: 'MULTIARCH', value: 'false'
-       }
+        environment name: 'EXIT_STATUS', value: ''
-       steps {
+      }
-         sh "docker build --no-cache -t ${IMAGE}:${META_TAG} \
+      steps {
-         --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
+        sh "docker build --no-cache -t ${IMAGE}:${META_TAG} \
-       }
+        --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
-     }
+      }
-     // Build MultiArch Docker containers for push to LS Repo
+    }
-     stage('Build-Multi') {
+    // Build MultiArch Docker containers for push to LS Repo
-       when {
+    stage('Build-Multi') {
-         environment name: 'MULTIARCH', value: 'true'
+      when {
-       }
+        environment name: 'MULTIARCH', value: 'true'
-       parallel {
+        environment name: 'EXIT_STATUS', value: ''
-         stage('Build X86') {
+      }
-           steps {
+      parallel {
-             sh "docker build --no-cache -t ${IMAGE}:amd64-${META_TAG} \
+        stage('Build X86') {
-             --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
+          steps {
-           }
+            sh "docker build --no-cache -t ${IMAGE}:amd64-${META_TAG} \
-         }
+            --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
-         stage('Build ARMHF') {
+          }
-           agent {
+        }
-             label 'ARMHF'
+        stage('Build ARMHF') {
-           }
+          agent {
-           steps {
+            label 'ARMHF'
-             withCredentials([
+          }
-               [
+          steps {
-                 $class: 'UsernamePasswordMultiBinding',
+            withCredentials([
-                 credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
+              [
-                 usernameVariable: 'DOCKERUSER',
+                $class: 'UsernamePasswordMultiBinding',
-                 passwordVariable: 'DOCKERPASS'
+                credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
-               ]
+                usernameVariable: 'DOCKERUSER',
-             ]) {
+                passwordVariable: 'DOCKERPASS'
-               echo 'Logging into DockerHub'
+              ]
-               sh '''#! /bin/bash
+            ]) {
-                  echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
+              echo 'Logging into DockerHub'
-                  '''
+              sh '''#! /bin/bash
-               sh "curl https://lsio-ci.ams3.digitaloceanspaces.com/qemu-arm-static -o qemu-arm-static"
+                 echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
-               sh "chmod +x qemu-*"
+                 '''
-               sh "docker build --no-cache -f Dockerfile.armhf -t ${IMAGE}:arm32v6-${META_TAG} \
+              sh "curl https://lsio-ci.ams3.digitaloceanspaces.com/qemu-arm-static -o qemu-arm-static"
-                            --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
+              sh "chmod +x qemu-*"
-               sh "docker tag ${IMAGE}:arm32v6-${META_TAG} lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER}"
+              sh "docker build --no-cache -f Dockerfile.armhf -t ${IMAGE}:arm32v6-${META_TAG} \
-               sh "docker push lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER}"
+                           --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
-             }
+              sh "docker tag ${IMAGE}:arm32v6-${META_TAG} lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER}"
-           }
+              sh "docker push lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER}"
-         }
+            }
-         stage('Build ARM64') {
+          }
-           agent {
+        }
-             label 'ARM64'
+        stage('Build ARM64') {
-           }
+          agent {
-           steps {
+            label 'ARM64'
-             withCredentials([
+          }
-               [
+          steps {
-                 $class: 'UsernamePasswordMultiBinding',
+            withCredentials([
-                 credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
+              [
-                 usernameVariable: 'DOCKERUSER',
+                $class: 'UsernamePasswordMultiBinding',
-                 passwordVariable: 'DOCKERPASS'
+                credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
-               ]
+                usernameVariable: 'DOCKERUSER',
-             ]) {
+                passwordVariable: 'DOCKERPASS'
-               echo 'Logging into DockerHub'
+              ]
-               sh '''#! /bin/bash
+            ]) {
-                  echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
+              echo 'Logging into DockerHub'
-                  '''
+              sh '''#! /bin/bash
-               sh "curl https://lsio-ci.ams3.digitaloceanspaces.com/qemu-aarch64-static -o qemu-aarch64-static"
+                 echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
-               sh "chmod +x qemu-*"
+                 '''
-               sh "docker build --no-cache -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \
+              sh "curl https://lsio-ci.ams3.digitaloceanspaces.com/qemu-aarch64-static -o qemu-aarch64-static"
-                            --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
+              sh "chmod +x qemu-*"
-               sh "docker tag ${IMAGE}:arm64v8-${META_TAG} lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
+              sh "docker build --no-cache -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \
-               sh "docker push lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
+                           --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${META_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
-             }
+              sh "docker tag ${IMAGE}:arm64v8-${META_TAG} lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
-           }
+              sh "docker push lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
-         }
+            }
-       }
+          }
-     }
+        }
+      }
+    }
+    // Take the image we just built and dump package versions for comparison
+    stage('Update-packages') {
+      when {
+        branch "master"
+        environment name: 'CHANGE_ID', value: ''
+        environment name: 'EXIT_STATUS', value: ''
+      }
+      steps {
+        sh '''#! /bin/bash
+              TEMPDIR=$(mktemp -d)
+              if [ "${MULTIARCH}" == "true" ]; then
+                LOCAL_CONTAINER=${IMAGE}:amd64-${META_TAG}
+              else
+                LOCAL_CONTAINER=${IMAGE}:${META_TAG}
+              fi
+              if [ "${DIST_IMAGE}" == "alpine" ]; then
+                docker run --rm -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} sh -c '\
+                  apk info > packages && \
+                  apk info -v > versions && \
+                  paste -d " " packages versions > /tmp/package_versions.txt'
+              elif [ "${DIST_IMAGE}" == "ubuntu" ]; then
+                docker run --rm -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} sh -c '\
+                  apt -qq list --installed | awk "{print \$1,\$2}" > /tmp/package_versions.txt'
+              fi
+              if [ "$(md5sum ${TEMPDIR}/package_versions.txt | cut -c1-8 )" != "${PACKAGE_TAG}" ]; then
+                git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/${LS_REPO}
+                cp ${TEMPDIR}/package_versions.txt ${TEMPDIR}/${LS_REPO}/
+                cd ${TEMPDIR}/${LS_REPO}/
+                git --git-dir ${TEMPDIR}/${LS_REPO}/.git add package_versions.txt
+                git --git-dir ${TEMPDIR}/${LS_REPO}/.git commit -m 'Bot Updating Package Versions'
+                git --git-dir ${TEMPDIR}/${LS_REPO}/.git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
+                echo "true" > /tmp/packages-${COMMIT_SHA}-${BUILD_NUMBER}
+              else
+                echo "false" > /tmp/packages-${COMMIT_SHA}-${BUILD_NUMBER}
+              fi
+              rm -Rf ${TEMPDIR}'''
+        script{
+          env.PACKAGE_UPDATED = sh(
+            script: '''cat /tmp/packages-${COMMIT_SHA}-${BUILD_NUMBER}''',
+            returnStdout: true).trim()
+        }
+      }
+    }
+    // Exit the build if the package file was just updated
+    stage('PACKAGE-exit') {
+      when {
+        branch "master"
+        environment name: 'CHANGE_ID', value: ''
+        environment name: 'PACKAGE_UPDATED', value: 'true'
+        environment name: 'EXIT_STATUS', value: ''
+      }
+      steps {
+        script{
+          env.EXIT_STATUS = 'ABORTED'
+        }
+      }
+    }
+    // Exit the build if this is just a package check and there are no changes to push
+    stage('PACKAGECHECK-exit') {
+      when {
+        branch "master"
+        environment name: 'CHANGE_ID', value: ''
+        environment name: 'PACKAGE_UPDATED', value: 'false'
+        environment name: 'EXIT_STATUS', value: ''
+        expression {
+          params.PACKAGE_CHECK == 'true'
+        }
+      }
+      steps {
+        script{
+          env.EXIT_STATUS = 'ABORTED'
+        }
+      }
+    }
     /* #######
        Testing
        ####### */
@@ -251,6 +382,7 @@ pipeline {
     stage('Test') {
       when {
         environment name: 'CI', value: 'true'
+        environment name: 'EXIT_STATUS', value: ''
       }
       steps {
         withCredentials([
@@ -297,6 +429,7 @@ pipeline {
     stage('Docker-Push-Single') {
       when {
         environment name: 'MULTIARCH', value: 'false'
+        environment name: 'EXIT_STATUS', value: ''
       }
       steps {
         withCredentials([
@@ -321,6 +454,7 @@ pipeline {
     stage('Docker-Push-Multi') {
       when {
         environment name: 'MULTIARCH', value: 'true'
+        environment name: 'EXIT_STATUS', value: ''
       }
       steps {
         withCredentials([
@@ -371,6 +505,7 @@ pipeline {
           env.LS_RELEASE != env.EXT_RELEASE + '-pkg-' + env.PACKAGE_TAG + '-ls' + env.LS_TAG_NUMBER
         }
         environment name: 'CHANGE_ID', value: ''
+        environment name: 'EXIT_STATUS', value: ''
       }
       steps {
         echo "Pushing New tag for current commit ${EXT_RELEASE}-pkg-${PACKAGE_TAG}-ls${LS_TAG_NUMBER}"
@@ -392,35 +527,11 @@ pipeline {
               curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done'''
       }
     }
-    // Use helper container to render a readme from remote and commit if different
-    stage('Update-README') {
-      when {
-        branch "master"
-        environment name: 'CHANGE_ID', value: ''
-        expression {
-          env.CONTAINER_NAME != null
-        }
-      }
-      steps {
-          sh '''#! /bin/bash
-                TEMPDIR=$(mktemp -d)
-                docker pull linuxserver/doc-builder:latest
-                docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -v ${TEMPDIR}:/ansible/readme linuxserver/doc-builder:latest
-                if [ "$(md5sum ${TEMPDIR}/${CONTAINER_NAME}/README.md | awk '{ print $1 }')" != "$(md5sum README.md | awk '{ print $1 }')" ]; then
-                  git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/${LS_REPO}
-                  cp ${TEMPDIR}/${CONTAINER_NAME}/README.md ${TEMPDIR}/${LS_REPO}/
-                  cd ${TEMPDIR}/${LS_REPO}/
-                  git --git-dir ${TEMPDIR}/${LS_REPO}/.git add README.md
-                  git --git-dir ${TEMPDIR}/${LS_REPO}/.git commit -m 'Bot Updating README from template'
-                  git --git-dir ${TEMPDIR}/${LS_REPO}/.git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
-                fi
-                rm -Rf ${TEMPDIR}'''
-      }
-    }
     // Use helper container to sync the current README on master to the dockerhub endpoint
     stage('Sync-README') {
       when {
         environment name: 'CHANGE_ID', value: ''
+        environment name: 'EXIT_STATUS', value: ''
       }
       steps {
         withCredentials([
@@ -448,15 +559,22 @@ pipeline {
      Send status to Discord
      ###################### */
   post {
-    success {
+    always {
-      sh ''' curl -X POST --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 1681177,\
+      script{
-             "description": "**Build:**  '${BUILD_NUMBER}'\\n**CI Results:**  '${CI_URL}'\\n**Status:**  Success\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\
+        if (env.EXIT_STATUS == "ABORTED"){
-             "username": "Jenkins"}' ${BUILDS_DISCORD} '''
+          sh 'echo "build aborted"'
-    }
+        }
-    failure {
+        else if (currentBuild.currentResult == "SUCCESS"){
-      sh ''' curl -X POST --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 16711680,\
+          sh ''' curl -X POST --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 1681177,\
-             "description": "**Build:**  '${BUILD_NUMBER}'\\n**CI Results:**  '${CI_URL}'\\n**Status:**  failure\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\
+                 "description": "**Build:**  '${BUILD_NUMBER}'\\n**CI Results:**  '${CI_URL}'\\n**Status:**  Success\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\
-             "username": "Jenkins"}' ${BUILDS_DISCORD} '''
+                 "username": "Jenkins"}' ${BUILDS_DISCORD} '''
+        }
+        else {
+          sh ''' curl -X POST --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 16711680,\
+                 "description": "**Build:**  '${BUILD_NUMBER}'\\n**CI Results:**  '${CI_URL}'\\n**Status:**  failure\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\
+                 "username": "Jenkins"}' ${BUILDS_DISCORD} '''
+        }
+      }
     }
   }
 }

package_versions.txt

@@ -0,0 +1,68 @@
+musl musl-1.1.19-r10
+busybox busybox-1.28.4-r1
+alpine-baselayout alpine-baselayout-3.1.0-r0
+alpine-keys alpine-keys-2.1-r1
+libressl2.7-libcrypto libressl2.7-libcrypto-2.7.4-r0
+libressl2.7-libssl libressl2.7-libssl-2.7.4-r0
+libressl2.7-libtls libressl2.7-libtls-2.7.4-r0
+ssl_client ssl_client-1.28.4-r1
+zlib zlib-1.2.11-r1
+apk-tools apk-tools-2.10.1-r0
+scanelf scanelf-1.2.3-r0
+musl-utils musl-utils-1.1.19-r10
+libc-utils libc-utils-0.7.1-r0
+xz-libs xz-libs-5.2.4-r0
+xz xz-5.2.4-r0
+ca-certificates ca-certificates-20171114-r3
+ncurses-terminfo-base ncurses-terminfo-base-6.1_p20180818-r1
+ncurses-terminfo ncurses-terminfo-6.1_p20180818-r1
+ncurses-libs ncurses-libs-6.1_p20180818-r1
+readline readline-7.0.003-r0
+bash bash-4.4.19-r1
+libattr libattr-2.4.47-r7
+libacl libacl-2.2.52-r5
+coreutils coreutils-8.29-r2
+linux-pam linux-pam-1.3.0-r0
+shadow shadow-4.5-r0
+tzdata tzdata-2018f-r0
+libuuid libuuid-2.32-r0
+apr apr-1.6.3-r1
+expat expat-2.2.5-r0
+apr-util apr-util-1.6.1-r2
+apache2-utils apache2-utils-2.4.35-r0
+nghttp2-libs nghttp2-libs-1.32.0-r0
+libssh2 libssh2-1.8.0-r3
+libcurl libcurl-7.61.1-r0
+pcre2 pcre2-10.31-r0
+git git-2.18.1-r0
+popt popt-1.16-r7
+logrotate logrotate-3.14.0-r0
+libmagic libmagic-5.32-r0
+nano nano-2.9.8-r0
+pcre pcre-8.42-r0
+nginx nginx-1.14.0-r1
+libcrypto1.0 libcrypto1.0-1.0.2p-r0
+libssl1.0 libssl1.0-1.0.2p-r0
+openssl openssl-1.0.2p-r0
+php7-common php7-common-7.2.10-r0
+libedit libedit-20170329.3.1-r3
+libxml2 libxml2-2.9.8-r1
+php7 php7-7.2.10-r0
+php7-fileinfo php7-fileinfo-7.2.10-r0
+php7-fpm php7-fpm-7.2.10-r0
+php7-json php7-json-7.2.10-r0
+php7-mbstring php7-mbstring-7.2.10-r0
+php7-openssl php7-openssl-7.2.10-r0
+php7-session php7-session-7.2.10-r0
+php7-simplexml php7-simplexml-7.2.10-r0
+php7-xml php7-xml-7.2.10-r0
+php7-xmlwriter php7-xmlwriter-7.2.10-r0
+curl curl-7.61.1-r0
+php7-ctype php7-ctype-7.2.10-r0
+php7-pdo php7-pdo-7.2.10-r0
+sqlite-libs sqlite-libs-3.24.0-r0
+php7-pdo_sqlite php7-pdo_sqlite-7.2.10-r0
+php7-tokenizer php7-tokenizer-7.2.10-r0
+libzip libzip-1.5.1-r1
+php7-zip php7-zip-7.2.10-r0
+tar tar-1.30-r0

readme-vars.yml

@@ -47,6 +47,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "04.11.18:", desc: "Add php7-zip." }
   - { 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." }

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

@@ -2,7 +2,7 @@
 
 # make our folders
 mkdir -p \
-	/config/www/{backgrounds,icons,avatars}
+	/config/www/{backgrounds,icons,avatars,SupportedApps}
 
 # copy .env if not exists
 [[ ! -f /config/www/.env ]] && \
@@ -16,6 +16,7 @@ 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/storage/app/SupportedApps \
 /var/www/localhost/heimdall/database/app.sqlite \
 /var/www/localhost/heimdall/.env )