Skip to content
This repository was archived by the owner on Jan 7, 2024. It is now read-only.

Commit 1ceb941

Browse files
thelamerthelamer
committed
adding 5.7 branch
1 parent a47c202 commit 1ceb941

File tree

6 files changed

+47
-47
lines changed

6 files changed

+47
-47
lines changed

‎Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
88
LABEL maintainer="sparklyballs"
99

1010
# environment settings
11-
ARG UNIFI_BRANCH="unifi-5.8"
11+
ARG UNIFI_BRANCH="unifi-5.7"
1212
ARG DEBIAN_FRONTEND="noninteractive"
1313

1414
RUN \

‎Dockerfile.aarch64

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
1111
LABEL maintainer="sparklyballs"
1212

1313
# environment settings
14-
ARG UNIFI_BRANCH="unifi-5.8"
14+
ARG UNIFI_BRANCH="unifi-5.7"
1515
ARG DEBIAN_FRONTEND="noninteractive"
1616

1717
RUN \

‎Dockerfile.armhf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
1111
LABEL maintainer="sparklyballs"
1212

1313
# environment settings
14-
ARG UNIFI_BRANCH="unifi-5.8"
14+
ARG UNIFI_BRANCH="unifi-5.7"
1515
ARG DEBIAN_FRONTEND="noninteractive"
1616

1717
RUN \

‎Jenkinsfile

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ pipeline {
1212
GITHUB_TOKEN=credentials('498b4638-2d02-4ce5-832d-8a57d01d97ab')
1313
BUILD_VERSION_ARG = 'UNIFI_VERSION'
1414
LS_USER = 'linuxserver'
15-
LS_REPO = 'docker-unifi'
16-
CONTAINER_NAME = 'unifi'
17-
DOCKERHUB_IMAGE = 'linuxserver/unifi'
18-
DEV_DOCKERHUB_IMAGE = 'lsiodev/unifi'
19-
PR_DOCKERHUB_IMAGE = 'lspipepr/unifi'
15+
LS_REPO = 'docker-unifi-controller'
16+
CONTAINER_NAME = 'unifi-controller'
17+
DOCKERHUB_IMAGE = 'linuxserver/unifi-controller'
18+
DEV_DOCKERHUB_IMAGE = 'lsiodev/unifi-controller'
19+
PR_DOCKERHUB_IMAGE = 'lspipepr/unifi-controller'
2020
DIST_IMAGE = 'ubuntu'
2121
MULTIARCH='true'
2222
CI='true'
@@ -96,7 +96,7 @@ pipeline {
9696
steps{
9797
script{
9898
env.EXT_RELEASE = sh(
99-
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}' ''',
99+
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}' ''',
100100
returnStdout: true).trim()
101101
env.RELEASE_LINK = 'custom_command'
102102
}
@@ -112,10 +112,10 @@ pipeline {
112112
}
113113
}
114114
}
115-
// If this is a 5.8 build use live docker endpoints
115+
// If this is a 5.7 build use live docker endpoints
116116
stage("Set ENV live build"){
117117
when {
118-
branch "5.8"
118+
branch "5.7"
119119
environment name: 'CHANGE_ID', value: ''
120120
}
121121
steps {
@@ -133,7 +133,7 @@ pipeline {
133133
// If this is a dev build use dev docker endpoints
134134
stage("Set ENV dev build"){
135135
when {
136-
not {branch "5.8"}
136+
not {branch "5.7"}
137137
environment name: 'CHANGE_ID', value: ''
138138
}
139139
steps {
@@ -171,7 +171,7 @@ pipeline {
171171
// Use helper containers to render templated files
172172
stage('Update-Templates') {
173173
when {
174-
branch "5.8"
174+
branch "5.7"
175175
environment name: 'CHANGE_ID', value: ''
176176
expression {
177177
env.CONTAINER_NAME != null
@@ -182,13 +182,13 @@ pipeline {
182182
set -e
183183
TEMPDIR=$(mktemp -d)
184184
docker pull linuxserver/jenkins-builder:latest
185-
docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=5.8 -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest
185+
docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=5.7 -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest
186186
docker pull linuxserver/doc-builder:latest
187-
docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=5.8 -v ${TEMPDIR}:/ansible/readme linuxserver/doc-builder:latest
187+
docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=5.7 -v ${TEMPDIR}:/ansible/readme linuxserver/doc-builder:latest
188188
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
189189
mkdir -p ${TEMPDIR}/repo
190190
git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
191-
git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git checkout -f 5.8
191+
git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git checkout -f 5.7
192192
cp ${TEMPDIR}/${CONTAINER_NAME}/README.md ${TEMPDIR}/repo/${LS_REPO}/
193193
cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/
194194
cd ${TEMPDIR}/repo/${LS_REPO}/
@@ -219,7 +219,7 @@ pipeline {
219219
// Exit the build if the Templated files were just updated
220220
stage('Template-exit') {
221221
when {
222-
branch "5.8"
222+
branch "5.7"
223223
environment name: 'CHANGE_ID', value: ''
224224
environment name: 'FILES_UPDATED', value: 'true'
225225
expression {
@@ -316,7 +316,7 @@ pipeline {
316316
// Take the image we just built and dump package versions for comparison
317317
stage('Update-packages') {
318318
when {
319-
branch "5.8"
319+
branch "5.7"
320320
environment name: 'CHANGE_ID', value: ''
321321
environment name: 'EXIT_STATUS', value: ''
322322
}
@@ -344,7 +344,7 @@ pipeline {
344344
echo "Package tag sha from current packages in buit container is ${NEW_PACKAGE_TAG} comparing to old ${PACKAGE_TAG} from github"
345345
if [ "${NEW_PACKAGE_TAG}" != "${PACKAGE_TAG}" ]; then
346346
git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/${LS_REPO}
347-
git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f 5.8
347+
git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f 5.7
348348
cp ${TEMPDIR}/package_versions.txt ${TEMPDIR}/${LS_REPO}/
349349
cd ${TEMPDIR}/${LS_REPO}/
350350
wait
@@ -368,7 +368,7 @@ pipeline {
368368
// Exit the build if the package file was just updated
369369
stage('PACKAGE-exit') {
370370
when {
371-
branch "5.8"
371+
branch "5.7"
372372
environment name: 'CHANGE_ID', value: ''
373373
environment name: 'PACKAGE_UPDATED', value: 'true'
374374
environment name: 'EXIT_STATUS', value: ''
@@ -382,7 +382,7 @@ pipeline {
382382
// Exit the build if this is just a package check and there are no changes to push
383383
stage('PACKAGECHECK-exit') {
384384
when {
385-
branch "5.8"
385+
branch "5.7"
386386
environment name: 'CHANGE_ID', value: ''
387387
environment name: 'PACKAGE_UPDATED', value: 'false'
388388
environment name: 'EXIT_STATUS', value: ''
@@ -466,8 +466,8 @@ pipeline {
466466
sh '''#! /bin/bash
467467
echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
468468
'''
469-
sh "docker tag ${IMAGE}:${META_TAG} ${IMAGE}:5.8"
470-
sh "docker push ${IMAGE}:5.8"
469+
sh "docker tag ${IMAGE}:${META_TAG} ${IMAGE}:5.7"
470+
sh "docker push ${IMAGE}:5.7"
471471
sh "docker push ${IMAGE}:${META_TAG}"
472472
}
473473
}
@@ -497,32 +497,32 @@ pipeline {
497497
docker tag lsiodev/buildcache:arm32v6-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v6-${META_TAG}
498498
docker tag lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
499499
fi'''
500-
sh "docker tag ${IMAGE}:amd64-${META_TAG} ${IMAGE}:amd64-5.8"
501-
sh "docker tag ${IMAGE}:arm32v6-${META_TAG} ${IMAGE}:arm32v6-5.8"
502-
sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ${IMAGE}:arm64v8-5.8"
500+
sh "docker tag ${IMAGE}:amd64-${META_TAG} ${IMAGE}:amd64-5.7"
501+
sh "docker tag ${IMAGE}:arm32v6-${META_TAG} ${IMAGE}:arm32v6-5.7"
502+
sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ${IMAGE}:arm64v8-5.7"
503503
sh "docker push ${IMAGE}:amd64-${META_TAG}"
504504
sh "docker push ${IMAGE}:arm32v6-${META_TAG}"
505505
sh "docker push ${IMAGE}:arm64v8-${META_TAG}"
506-
sh "docker push ${IMAGE}:amd64-5.8"
507-
sh "docker push ${IMAGE}:arm32v6-5.8"
508-
sh "docker push ${IMAGE}:arm64v8-5.8"
509-
sh "docker manifest push --purge ${IMAGE}:5.8 || :"
510-
sh "docker manifest create ${IMAGE}:5.8 ${IMAGE}:amd64-5.8 ${IMAGE}:arm32v6-5.8 ${IMAGE}:arm64v8-5.8"
511-
sh "docker manifest annotate ${IMAGE}:5.8 ${IMAGE}:arm32v6-5.8 --os linux --arch arm"
512-
sh "docker manifest annotate ${IMAGE}:5.8 ${IMAGE}:arm64v8-5.8 --os linux --arch arm64 --variant v8"
506+
sh "docker push ${IMAGE}:amd64-5.7"
507+
sh "docker push ${IMAGE}:arm32v6-5.7"
508+
sh "docker push ${IMAGE}:arm64v8-5.7"
509+
sh "docker manifest push --purge ${IMAGE}:5.7 || :"
510+
sh "docker manifest create ${IMAGE}:5.7 ${IMAGE}:amd64-5.7 ${IMAGE}:arm32v6-5.7 ${IMAGE}:arm64v8-5.7"
511+
sh "docker manifest annotate ${IMAGE}:5.7 ${IMAGE}:arm32v6-5.7 --os linux --arch arm"
512+
sh "docker manifest annotate ${IMAGE}:5.7 ${IMAGE}:arm64v8-5.7 --os linux --arch arm64 --variant v8"
513513
sh "docker manifest push --purge ${IMAGE}:${META_TAG} || :"
514514
sh "docker manifest create ${IMAGE}:${META_TAG} ${IMAGE}:amd64-${META_TAG} ${IMAGE}:arm32v6-${META_TAG} ${IMAGE}:arm64v8-${META_TAG}"
515515
sh "docker manifest annotate ${IMAGE}:${META_TAG} ${IMAGE}:arm32v6-${META_TAG} --os linux --arch arm"
516516
sh "docker manifest annotate ${IMAGE}:${META_TAG} ${IMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8"
517-
sh "docker manifest push --purge ${IMAGE}:5.8"
517+
sh "docker manifest push --purge ${IMAGE}:5.7"
518518
sh "docker manifest push --purge ${IMAGE}:${META_TAG}"
519519
}
520520
}
521521
}
522522
// If this is a public release tag it in the LS Github
523523
stage('Github-Tag-Push-Release') {
524524
when {
525-
branch "5.8"
525+
branch "5.7"
526526
expression {
527527
env.LS_RELEASE != env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-ls' + env.LS_TAG_NUMBER
528528
}
@@ -534,14 +534,14 @@ pipeline {
534534
sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \
535535
-d '{"tag":"'${EXT_RELEASE_CLEAN}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}'",\
536536
"object": "'${COMMIT_SHA}'",\
537-
"message": "Tagging Release '${EXT_RELEASE_CLEAN}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}' to 5.8",\
537+
"message": "Tagging Release '${EXT_RELEASE_CLEAN}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}' to 5.7",\
538538
"type": "commit",\
539539
"tagger": {"name": "LinuxServer Jenkins","email": "[email protected]","date": "'${GITHUB_DATE}'"}}' '''
540540
echo "Pushing New release for Tag"
541541
sh '''#! /bin/bash
542542
echo "Updating to ${EXT_RELEASE_CLEAN}" > releasebody.json
543543
echo '{"tag_name":"'${EXT_RELEASE_CLEAN}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}'",\
544-
"target_commitish": "5.8",\
544+
"target_commitish": "5.7",\
545545
"name": "'${EXT_RELEASE_CLEAN}'-pkg-'${PACKAGE_TAG}'-ls'${LS_TAG_NUMBER}'",\
546546
"body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n**Remote Changes:**\\n\\n' > start
547547
printf '","draft": false,"prerelease": true}' >> releasebody.json

‎jenkins-vars.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
---
22

33
# jenkins variables
4-
project_name: docker-unifi
4+
project_name: docker-unifi-controller
55
external_type: na
6-
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}'"
6+
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}'"
77
release_type: prerelease
8-
release_tag: 5.8
9-
ls_branch: 5.8
8+
release_tag: 5.7
9+
ls_branch: 5.7
1010
repo_vars:
1111
- BUILD_VERSION_ARG = 'UNIFI_VERSION'
1212
- LS_USER = 'linuxserver'
13-
- LS_REPO = 'docker-unifi'
14-
- CONTAINER_NAME = 'unifi'
15-
- DOCKERHUB_IMAGE = 'linuxserver/unifi'
16-
- DEV_DOCKERHUB_IMAGE = 'lsiodev/unifi'
17-
- PR_DOCKERHUB_IMAGE = 'lspipepr/unifi'
13+
- LS_REPO = 'docker-unifi-controller'
14+
- CONTAINER_NAME = 'unifi-controller'
15+
- DOCKERHUB_IMAGE = 'linuxserver/unifi-controller'
16+
- DEV_DOCKERHUB_IMAGE = 'lsiodev/unifi-controller'
17+
- PR_DOCKERHUB_IMAGE = 'lspipepr/unifi-controller'
1818
- DIST_IMAGE = 'ubuntu'
1919
- MULTIARCH='true'
2020
- CI='true'

‎readme-vars.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22

33
# project information
4-
project_name: unifi
4+
project_name: unifi-controller
55
full_custom_readme: |
66
{% raw -%}
77
[linuxserverurl]: https://linuxserver.io

0 commit comments

Comments
 (0)