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