adding 5.7 branch

Author: thelamer

Dockerfile

@@ -8,7 +8,7 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
 LABEL maintainer="sparklyballs"
 
 # environment settings
-ARG UNIFI_BRANCH="unifi-5.8"
+ARG UNIFI_BRANCH="unifi-5.7"
 ARG DEBIAN_FRONTEND="noninteractive"
 
 RUN \

Dockerfile.aarch64

@@ -11,7 +11,7 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
 LABEL maintainer="sparklyballs"
 
 # environment settings
-ARG UNIFI_BRANCH="unifi-5.8"
+ARG UNIFI_BRANCH="unifi-5.7"
 ARG DEBIAN_FRONTEND="noninteractive"
 
 RUN \

Dockerfile.armhf

@@ -11,7 +11,7 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
 LABEL maintainer="sparklyballs"
 
 # environment settings
-ARG UNIFI_BRANCH="unifi-5.8"
+ARG UNIFI_BRANCH="unifi-5.7"
 ARG DEBIAN_FRONTEND="noninteractive"
 
 RUN \

Jenkinsfile

@@ -12,11 +12,11 @@ pipeline {
     GITHUB_TOKEN=credentials('498b4638-2d02-4ce5-832d-8a57d01d97ab')
     BUILD_VERSION_ARG = 'UNIFI_VERSION'
     LS_USER = 'linuxserver'
-    LS_REPO = 'docker-unifi'
-    CONTAINER_NAME = 'unifi'
-    DOCKERHUB_IMAGE = 'linuxserver/unifi'
-    DEV_DOCKERHUB_IMAGE = 'lsiodev/unifi'
-    PR_DOCKERHUB_IMAGE = 'lspipepr/unifi'
+    LS_REPO = 'docker-unifi-controller'
+    CONTAINER_NAME = 'unifi-controller'
+    DOCKERHUB_IMAGE = 'linuxserver/unifi-controller'
+    DEV_DOCKERHUB_IMAGE = 'lsiodev/unifi-controller'
+    PR_DOCKERHUB_IMAGE = 'lspipepr/unifi-controller'
     DIST_IMAGE = 'ubuntu'
     MULTIARCH='true'
     CI='true'
@@ -96,7 +96,7 @@ pipeline {
       steps{
         script{
           env.EXT_RELEASE = sh(
-            script: ''' curl -sX GET http://dl-origin.ubnt.com/unifi/debian/dists/unifi-5.8/ubiquiti/binary-amd64/Packages |grep -A 7 -m 1 'Package: unifi' | awk -F ': ' '/Version/{print $2;exit}' | awk -F '-' '{print $1}' ''',
+            script: ''' curl -sX GET http://dl-origin.ubnt.com/unifi/debian/dists/unifi-5.7/ubiquiti/binary-amd64/Packages |grep -A 7 -m 1 'Package: unifi' | awk -F ': ' '/Version/{print $2;exit}' | awk -F '-' '{print $1}' ''',
             returnStdout: true).trim()
             env.RELEASE_LINK = 'custom_command'
         }
@@ -112,10 +112,10 @@ pipeline {
         }
       }
     }
-    // If this is a 5.8 build use live docker endpoints
+    // If this is a 5.7 build use live docker endpoints
     stage("Set ENV live build"){
       when {
-        branch "5.8"
+        branch "5.7"
         environment name: 'CHANGE_ID', value: ''
       }
       steps {
@@ -133,7 +133,7 @@ pipeline {
     // If this is a dev build use dev docker endpoints
     stage("Set ENV dev build"){
       when {
-        not {branch "5.8"}
+        not {branch "5.7"}
         environment name: 'CHANGE_ID', value: ''
       }
       steps {
@@ -171,7 +171,7 @@ pipeline {
     // Use helper containers to render templated files
     stage('Update-Templates') {
       when {
-        branch "5.8"
+        branch "5.7"
         environment name: 'CHANGE_ID', value: ''
         expression {
           env.CONTAINER_NAME != null
@@ -182,13 +182,13 @@ pipeline {
               set -e
               TEMPDIR=$(mktemp -d)
               docker pull linuxserver/jenkins-builder:latest
-              docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=5.8 -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest 
+              docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=5.7 -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest 
               docker pull linuxserver/doc-builder:latest
-              docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=5.8 -v ${TEMPDIR}:/ansible/readme linuxserver/doc-builder:latest
+              docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=5.7 -v ${TEMPDIR}:/ansible/readme linuxserver/doc-builder:latest
               if [ "$(md5sum ${TEMPDIR}/${LS_REPO}/Jenkinsfile | awk '{ print $1 }')" != "$(md5sum Jenkinsfile | awk '{ print $1 }')" ] || [ "$(md5sum ${TEMPDIR}/${CONTAINER_NAME}/README.md | awk '{ print $1 }')" != "$(md5sum README.md | awk '{ print $1 }')" ]; then
                 mkdir -p ${TEMPDIR}/repo
                 git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
-                git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git checkout -f 5.8
+                git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git checkout -f 5.7
                 cp ${TEMPDIR}/${CONTAINER_NAME}/README.md ${TEMPDIR}/repo/${LS_REPO}/
                 cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/
                 cd ${TEMPDIR}/repo/${LS_REPO}/
@@ -219,7 +219,7 @@ pipeline {
     // Exit the build if the Templated files were just updated
     stage('Template-exit') {
       when {
-        branch "5.8"
+        branch "5.7"
         environment name: 'CHANGE_ID', value: ''
         environment name: 'FILES_UPDATED', value: 'true'
         expression {
@@ -316,7 +316,7 @@ pipeline {
     // Take the image we just built and dump package versions for comparison
     stage('Update-packages') {
       when {
-        branch "5.8"
+        branch "5.7"
         environment name: 'CHANGE_ID', value: ''
         environment name: 'EXIT_STATUS', value: ''
       }
@@ -344,7 +344,7 @@ pipeline {
               echo "Package tag sha from current packages in buit container is ${NEW_PACKAGE_TAG} comparing to old ${PACKAGE_TAG} from github"
               if [ "${NEW_PACKAGE_TAG}" != "${PACKAGE_TAG}" ]; then
                 git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/${LS_REPO}
-                git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f 5.8
+                git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f 5.7
                 cp ${TEMPDIR}/package_versions.txt ${TEMPDIR}/${LS_REPO}/
                 cd ${TEMPDIR}/${LS_REPO}/
                 wait
@@ -368,7 +368,7 @@ pipeline {
     // Exit the build if the package file was just updated
     stage('PACKAGE-exit') {
       when {
-        branch "5.8"
+        branch "5.7"
         environment name: 'CHANGE_ID', value: ''
         environment name: 'PACKAGE_UPDATED', value: 'true'
         environment name: 'EXIT_STATUS', value: ''
@@ -382,7 +382,7 @@ pipeline {
     // Exit the build if this is just a package check and there are no changes to push
     stage('PACKAGECHECK-exit') {
       when {
-        branch "5.8"
+        branch "5.7"
         environment name: 'CHANGE_ID', value: ''
         environment name: 'PACKAGE_UPDATED', value: 'false'
         environment name: 'EXIT_STATUS', value: ''
@@ -466,8 +466,8 @@ pipeline {
           sh '''#! /bin/bash
              echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
              '''
-          sh "docker tag ${IMAGE}:${META_TAG} ${IMAGE}:5.8"
-          sh "docker push ${IMAGE}:5.8"
+          sh "docker tag ${IMAGE}:${META_TAG} ${IMAGE}:5.7"
+          sh "docker push ${IMAGE}:5.7"
           sh "docker push ${IMAGE}:${META_TAG}"
         }
       }
@@ -497,32 +497,32 @@ pipeline {
                   docker tag lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v6-${META_TAG}
                   docker tag lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
                 fi'''
-          sh "docker tag ${IMAGE}:amd64-${META_TAG} ${IMAGE}:amd64-5.8"
-          sh "docker tag ${IMAGE}:arm32v6-${META_TAG} ${IMAGE}:arm32v6-5.8"
-          sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ${IMAGE}:arm64v8-5.8"
+          sh "docker tag ${IMAGE}:amd64-${META_TAG} ${IMAGE}:amd64-5.7"
+          sh "docker tag ${IMAGE}:arm32v6-${META_TAG} ${IMAGE}:arm32v6-5.7"
+          sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ${IMAGE}:arm64v8-5.7"
           sh "docker push ${IMAGE}:amd64-${META_TAG}"
           sh "docker push ${IMAGE}:arm32v6-${META_TAG}"
           sh "docker push ${IMAGE}:arm64v8-${META_TAG}"
-          sh "docker push ${IMAGE}:amd64-5.8"
-          sh "docker push ${IMAGE}:arm32v6-5.8"
-          sh "docker push ${IMAGE}:arm64v8-5.8"
-          sh "docker manifest push --purge ${IMAGE}:5.8 || :"
-          sh "docker manifest create ${IMAGE}:5.8 ${IMAGE}:amd64-5.8 ${IMAGE}:arm32v6-5.8 ${IMAGE}:arm64v8-5.8"
-          sh "docker manifest annotate ${IMAGE}:5.8 ${IMAGE}:arm32v6-5.8 --os linux --arch arm"
-          sh "docker manifest annotate ${IMAGE}:5.8 ${IMAGE}:arm64v8-5.8 --os linux --arch arm64 --variant v8"
+          sh "docker push ${IMAGE}:amd64-5.7"
+          sh "docker push ${IMAGE}:arm32v6-5.7"
+          sh "docker push ${IMAGE}:arm64v8-5.7"
+          sh "docker manifest push --purge ${IMAGE}:5.7 || :"
+          sh "docker manifest create ${IMAGE}:5.7 ${IMAGE}:amd64-5.7 ${IMAGE}:arm32v6-5.7 ${IMAGE}:arm64v8-5.7"
+          sh "docker manifest annotate ${IMAGE}:5.7 ${IMAGE}:arm32v6-5.7 --os linux --arch arm"
+          sh "docker manifest annotate ${IMAGE}:5.7 ${IMAGE}:arm64v8-5.7 --os linux --arch arm64 --variant v8"
           sh "docker manifest push --purge ${IMAGE}:${META_TAG} || :"
           sh "docker manifest create ${IMAGE}:${META_TAG} ${IMAGE}:amd64-${META_TAG} ${IMAGE}:arm32v6-${META_TAG} ${IMAGE}:arm64v8-${META_TAG}"
           sh "docker manifest annotate ${IMAGE}:${META_TAG} ${IMAGE}:arm32v6-${META_TAG} --os linux --arch arm"
           sh "docker manifest annotate ${IMAGE}:${META_TAG} ${IMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8"
-          sh "docker manifest push --purge ${IMAGE}:5.8"
+          sh "docker manifest push --purge ${IMAGE}:5.7"
           sh "docker manifest push --purge ${IMAGE}:${META_TAG}"
         }
       }
     }
     // If this is a public release tag it in the LS Github
     stage('Github-Tag-Push-Release') {
       when {
-        branch "5.8"
+        branch "5.7"
         expression {
           env.LS_RELEASE != env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-ls' + env.LS_TAG_NUMBER
         }
@@ -534,14 +534,14 @@ pipeline {
         sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \
         -d '{"tag":"'${EXT_RELEASE_CLEAN}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}'",\
              "object": "'${COMMIT_SHA}'",\
-             "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}' to 5.8",\
+             "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}' to 5.7",\
              "type": "commit",\
              "tagger": {"name": "LinuxServer Jenkins","email": "jenkins@linuxserver.io","date": "'${GITHUB_DATE}'"}}' '''
         echo "Pushing New release for Tag"
         sh '''#! /bin/bash
               echo "Updating to ${EXT_RELEASE_CLEAN}" > releasebody.json
               echo '{"tag_name":"'${EXT_RELEASE_CLEAN}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}'",\
-                     "target_commitish": "5.8",\
+                     "target_commitish": "5.7",\
                      "name": "'${EXT_RELEASE_CLEAN}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}'",\
                      "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n**Remote Changes:**\\n\\n' > start
               printf '","draft": false,"prerelease": true}' >> releasebody.json

jenkins-vars.yml

@@ -1,20 +1,20 @@
 ---
 
 # jenkins variables
-project_name: docker-unifi
+project_name: docker-unifi-controller
 external_type: na
-custom_version_command: "curl -sX GET http://dl-origin.ubnt.com/unifi/debian/dists/unifi-5.8/ubiquiti/binary-amd64/Packages |grep -A 7 -m 1 'Package: unifi' | awk -F ': ' '/Version/{print $2;exit}' | awk -F '-' '{print $1}'"
+custom_version_command: "curl -sX GET http://dl-origin.ubnt.com/unifi/debian/dists/unifi-5.7/ubiquiti/binary-amd64/Packages |grep -A 7 -m 1 'Package: unifi' | awk -F ': ' '/Version/{print $2;exit}' | awk -F '-' '{print $1}'"
 release_type: prerelease
-release_tag: 5.8
-ls_branch: 5.8
+release_tag: 5.7
+ls_branch: 5.7
 repo_vars:
   - BUILD_VERSION_ARG = 'UNIFI_VERSION'
   - LS_USER = 'linuxserver'
-  - LS_REPO = 'docker-unifi'
-  - CONTAINER_NAME = 'unifi'
-  - DOCKERHUB_IMAGE = 'linuxserver/unifi'
-  - DEV_DOCKERHUB_IMAGE = 'lsiodev/unifi'
-  - PR_DOCKERHUB_IMAGE = 'lspipepr/unifi'
+  - LS_REPO = 'docker-unifi-controller'
+  - CONTAINER_NAME = 'unifi-controller'
+  - DOCKERHUB_IMAGE = 'linuxserver/unifi-controller'
+  - DEV_DOCKERHUB_IMAGE = 'lsiodev/unifi-controller'
+  - PR_DOCKERHUB_IMAGE = 'lspipepr/unifi-controller'
   - DIST_IMAGE = 'ubuntu'
   - MULTIARCH='true'
   - CI='true'

readme-vars.yml

@@ -1,7 +1,7 @@
 ---
 
 # project information
-project_name: unifi
+project_name: unifi-controller
 full_custom_readme: |
   {% raw -%}
   [linuxserverurl]: https://linuxserver.io