@@ -119,12 +119,11 @@ pipeline {
119
119
script : ''' echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g' ''' ,
120
120
returnStdout : true ). trim()
121
121
122
- env. SEMVER = (new Date ()). format(' YYYY.MM.dd' )
123
- def semver = env. EXT_RELEASE_CLEAN =~ / (\d +)\. (\d +)\. (\d +)$/
122
+ def semver = env. EXT_RELEASE_CLEAN =~ / (\d +)\. (\d +)\. (\d +)/
124
123
if (semver. find()) {
125
124
env. SEMVER = " ${ semver[0][1]} .${ semver[0][2]} .${ semver[0][3]} "
126
125
} else {
127
- semver = env. EXT_RELEASE_CLEAN =~ / (\d +)\. (\d +)(?:\. (\d +))?(.*)$ /
126
+ semver = env. EXT_RELEASE_CLEAN =~ / (\d +)\. (\d +)(?:\. (\d +))?(.*)/
128
127
if (semver. find()) {
129
128
if (semver[0 ][3 ]) {
130
129
env. SEMVER = " ${ semver[0][1]} .${ semver[0][2]} .${ semver[0][3]} "
@@ -134,7 +133,15 @@ pipeline {
134
133
}
135
134
}
136
135
137
- println (" SEMVER: ${ env.SEMVER} " )
136
+ if (env. SEMVER != null ) {
137
+ if (BRANCH_NAME != " master" && BRANCH_NAME != " main" ) {
138
+ env. SEMVER = " ${ env.SEMVER} -${ BRANCH_NAME} "
139
+ }
140
+ println (" SEMVER: ${ env.SEMVER} " )
141
+ } else {
142
+ println (" No SEMVER detected" )
143
+ }
144
+
138
145
}
139
146
}
140
147
}
@@ -403,33 +410,21 @@ pipeline {
403
410
steps{
404
411
sh ''' #! /bin/bash
405
412
set -e
406
- PACKAGE_UUID=$(curl -X GET -H "Authorization: Bearer ${SCARF_TOKEN}" https://scarf.sh/api/v1/packages | jq -r '.[] | select(.name=="linuxserver/ldap-auth") | .uuid')
413
+ PACKAGE_UUID=$(curl -X GET -H "Authorization: Bearer ${SCARF_TOKEN}" https://scarf.sh/api/v1/organizations/linuxserver-ci/ packages | jq -r '.[] | select(.name=="linuxserver/ldap-auth") | .uuid')
407
414
if [ -z "${PACKAGE_UUID}" ]; then
408
415
echo "Adding package to Scarf.sh"
409
- PACKAGE_UUID=$( curl -sX POST https://scarf.sh/api/v1/packages \
416
+ curl -sX POST https://scarf.sh/api/v1/organizations/linuxserver-ci /packages \
410
417
-H "Authorization: Bearer ${SCARF_TOKEN}" \
411
418
-H "Content-Type: application/json" \
412
419
-d '{"name":"linuxserver/ldap-auth",\
413
420
"shortDescription":"example description",\
414
421
"libraryType":"docker",\
415
422
"website":"https://github.com/linuxserver/docker-ldap-auth",\
416
423
"backendUrl":"https://ghcr.io/linuxserver/ldap-auth",\
417
- "publicUrl":"https://lscr.io/linuxserver/ldap-auth"}' \
418
- | jq -r .uuid)
424
+ "publicUrl":"https://lscr.io/linuxserver/ldap-auth"}' || :
419
425
else
420
426
echo "Package already exists on Scarf.sh"
421
427
fi
422
- echo "Setting permissions on Scarf.sh for package ${PACKAGE_UUID}"
423
- curl -X POST https://scarf.sh/api/v1/packages/${PACKAGE_UUID}/permissions \
424
- -H "Authorization: Bearer ${SCARF_TOKEN}" \
425
- -H "Content-Type: application/json" \
426
- -d '[{"userQuery":"Spad","permissionLevel":"admin"},\
427
- {"userQuery":"roxedus","permissionLevel":"admin"},\
428
- {"userQuery":"nemchik","permissionLevel":"admin"},\
429
- {"userQuery":"driz","permissionLevel":"admin"},\
430
- {"userQuery":"aptalca","permissionLevel":"admin"},\
431
- {"userQuery":"saarg","permissionLevel":"admin"},\
432
- {"userQuery":"Stark","permissionLevel":"admin"}]'
433
428
'''
434
429
}
435
430
}
@@ -753,11 +748,15 @@ pipeline {
753
748
docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG}
754
749
docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:latest
755
750
docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${EXT_RELEASE_TAG}
756
- docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${SEMVER}
751
+ if [ -n "${SEMVER}" ]; then
752
+ docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${SEMVER}
753
+ fi
757
754
docker push ${PUSHIMAGE}:latest
758
755
docker push ${PUSHIMAGE}:${META_TAG}
759
756
docker push ${PUSHIMAGE}:${EXT_RELEASE_TAG}
760
- docker push ${PUSHIMAGE}:${SEMVER}
757
+ if [ -n "${SEMVER}" ]; then
758
+ docker push ${PUSHIMAGE}:${SEMVER}
759
+ fi
761
760
done
762
761
'''
763
762
}
@@ -766,8 +765,10 @@ pipeline {
766
765
docker rmi \
767
766
${DELETEIMAGE}:${META_TAG} \
768
767
${DELETEIMAGE}:${EXT_RELEASE_TAG} \
769
- ${DELETEIMAGE}:latest \
770
- ${DELETEIMAGE}:${SEMVER} || :
768
+ ${DELETEIMAGE}:latest || :
769
+ if [ -n "${SEMVER}" ]; then
770
+ docker rmi ${DELETEIMAGE}:${SEMVER} || :
771
+ fi
771
772
done
772
773
'''
773
774
}
@@ -817,9 +818,11 @@ pipeline {
817
818
docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
818
819
docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
819
820
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
820
- docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER}
821
- docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${SEMVER}
822
- docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
821
+ if [ -n "${SEMVER}" ]; then
822
+ docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER}
823
+ docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${SEMVER}
824
+ docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
825
+ fi
823
826
docker push ${MANIFESTIMAGE}:amd64-${META_TAG}
824
827
docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG}
825
828
docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
@@ -829,9 +832,11 @@ pipeline {
829
832
docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
830
833
docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
831
834
docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
832
- docker push ${MANIFESTIMAGE}:amd64-${SEMVER}
833
- docker push ${MANIFESTIMAGE}:arm32v7-${SEMVER}
834
- docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER}
835
+ if [ -n "${SEMVER}" ]; then
836
+ docker push ${MANIFESTIMAGE}:amd64-${SEMVER}
837
+ docker push ${MANIFESTIMAGE}:arm32v7-${SEMVER}
838
+ docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER}
839
+ fi
835
840
docker manifest push --purge ${MANIFESTIMAGE}:latest || :
836
841
docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:arm64v8-latest
837
842
docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm32v7-latest --os linux --arch arm
@@ -844,14 +849,18 @@ pipeline {
844
849
docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
845
850
docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} --os linux --arch arm
846
851
docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8
847
- docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || :
848
- docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
849
- docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} --os linux --arch arm
850
- docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8
852
+ if [ -n "${SEMVER}" ]; then
853
+ docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || :
854
+ docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
855
+ docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} --os linux --arch arm
856
+ docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8
857
+ fi
851
858
docker manifest push --purge ${MANIFESTIMAGE}:latest
852
859
docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG}
853
860
docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG}
854
- docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER}
861
+ if [ -n "${SEMVER}" ]; then
862
+ docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER}
863
+ fi
855
864
done
856
865
'''
857
866
}
@@ -861,15 +870,18 @@ pipeline {
861
870
${DELETEIMAGE}:amd64-${META_TAG} \
862
871
${DELETEIMAGE}:amd64-latest \
863
872
${DELETEIMAGE}:amd64-${EXT_RELEASE_TAG} \
864
- ${DELETEIMAGE}:amd64-${SEMVER} \
865
873
${DELETEIMAGE}:arm32v7-${META_TAG} \
866
874
${DELETEIMAGE}:arm32v7-latest \
867
875
${DELETEIMAGE}:arm32v7-${EXT_RELEASE_TAG} \
868
- ${DELETEIMAGE}:arm32v7-${SEMVER} \
869
876
${DELETEIMAGE}:arm64v8-${META_TAG} \
870
877
${DELETEIMAGE}:arm64v8-latest \
871
- ${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} \
872
- ${DELETEIMAGE}:arm64v8-${SEMVER} || :
878
+ ${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} || :
879
+ if [ -n "${SEMVER}" ]; then
880
+ docker rmi \
881
+ ${DELETEIMAGE}:amd64-${SEMVER} \
882
+ ${DELETEIMAGE}:arm32v7-${SEMVER} \ \
883
+ ${DELETEIMAGE}:arm64v8-${SEMVER} || :
884
+ fi
873
885
done
874
886
docker rmi \
875
887
ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \
0 commit comments