Skip to content

Commit 8a48283

Browse files
porthorianporthorian
committed
Merge branch 'main' into vm/cert-keystore
2 parents bc3f2ec + f82359c commit 8a48283

File tree

8 files changed

+411
-391
lines changed

8 files changed

+411
-391
lines changed

‎.github/workflows/external_trigger.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
3030
echo "> External trigger running off of main branch. To disable this trigger, add \`unifi-network-application_main\` into the Github organizational variable \`SKIP_EXTERNAL_TRIGGER\`." >> $GITHUB_STEP_SUMMARY
3131
printf "\n## Retrieving external version\n\n" >> $GITHUB_STEP_SUMMARY
32-
EXT_RELEASE=$(curl -sX GET https://dl.ui.com/unifi/debian/dists/stable/ubiquiti/binary-amd64/Packages.gz | gunzip | grep -A 7 -m 1 'Package: unifi' | awk -F ': ' '/Version/{print $2;exit}' | awk -F '-' '{print $1}')
32+
EXT_RELEASE=$(curl -sX GET 'https://fw-update.ubnt.com/api/firmware-latest?filter=eq~~product~~unifi-controller&filter=eq~~platform~~unix&filter=eq~~channel~~release' | jq -r '._embedded.firmware[].version' | awk -F '+' '{print $1}' | tr -d 'v')
3333
echo "Type is \`custom_version_command\`" >> $GITHUB_STEP_SUMMARY
3434
if grep -q "^unifi-network-application_main_${EXT_RELEASE}" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
3535
echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY

‎Dockerfile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
1010
LABEL maintainer="thespad"
1111

1212
# environment settings
13-
ARG UNIFI_BRANCH="stable"
1413
ENV DEBIAN_FRONTEND="noninteractive"
1514

1615
RUN \
@@ -23,16 +22,17 @@ RUN \
2322
unzip && \
2423
echo "**** install unifi ****" && \
2524
if [ -z ${UNIFI_VERSION+x} ]; then \
26-
UNIFI_VERSION=$(curl -sX GET https://dl.ui.com/unifi/debian/dists/${UNIFI_BRANCH}/ubiquiti/binary-amd64/Packages.gz \
27-
| gunzip \
28-
| grep -A 7 -m 1 'Package: unifi' \
29-
| awk -F ': ' '/Version/{print $2;exit}' \
30-
| awk -F '-' '{print $1}'); \
25+
UNIFI_VERSION=$(curl -sX GET "https://fw-update.ubnt.com/api/firmware-latest?filter=eq~~product~~unifi-controller&filter=eq~~platform~~unix&filter=eq~~channel~~release" \
26+
| jq -r '._embedded.firmware[].version' \
27+
| awk -F '+' '{print $1}' \
28+
| tr -d 'v'); \
3129
fi && \
30+
UNIFI_DOWNLOAD=$(curl -sX GET "https://fw-update.ubnt.com/api/firmware?filter=eq~~product~~unifi-controller&filter=eq~~platform~~unix&filter=eq~~channel~~release&sort=-version" \
31+
| jq -r "._embedded.firmware[] | select(.version | test(\"v${UNIFI_VERSION}\")) | ._links.data.href") && \
3232
mkdir -p /app && \
3333
curl -o \
3434
/tmp/unifi.zip -L \
35-
"https://dl.ui.com/unifi/${UNIFI_VERSION}/UniFi.unix.zip" && \
35+
"${UNIFI_DOWNLOAD}" && \
3636
unzip /tmp/unifi.zip -d /usr/lib && \
3737
mv /usr/lib/UniFi /usr/lib/unifi && \
3838
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \

‎Dockerfile.aarch64‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
1010
LABEL maintainer="thespad"
1111

1212
# environment settings
13-
ARG UNIFI_BRANCH="stable"
1413
ENV DEBIAN_FRONTEND="noninteractive"
1514

1615
RUN \
@@ -23,16 +22,17 @@ RUN \
2322
unzip && \
2423
echo "**** install unifi ****" && \
2524
if [ -z ${UNIFI_VERSION+x} ]; then \
26-
UNIFI_VERSION=$(curl -sX GET https://dl.ui.com/unifi/debian/dists/${UNIFI_BRANCH}/ubiquiti/binary-amd64/Packages.gz \
27-
| gunzip \
28-
| grep -A 7 -m 1 'Package: unifi' \
29-
| awk -F ': ' '/Version/{print $2;exit}' \
30-
| awk -F '-' '{print $1}'); \
25+
UNIFI_VERSION=$(curl -sX GET "https://fw-update.ubnt.com/api/firmware-latest?filter=eq~~product~~unifi-controller&filter=eq~~platform~~unix&filter=eq~~channel~~release" \
26+
| jq -r '._embedded.firmware[].version' \
27+
| awk -F '+' '{print $1}' \
28+
| tr -d 'v'); \
3129
fi && \
30+
UNIFI_DOWNLOAD=$(curl -sX GET "https://fw-update.ubnt.com/api/firmware?filter=eq~~product~~unifi-controller&filter=eq~~platform~~unix&filter=eq~~channel~~release&sort=-version" \
31+
| jq -r "._embedded.firmware[] | select(.version | test(\"v${UNIFI_VERSION}\")) | ._links.data.href") && \
3232
mkdir -p /app && \
3333
curl -o \
3434
/tmp/unifi.zip -L \
35-
"https://dl.ui.com/unifi/${UNIFI_VERSION}/UniFi.unix.zip" && \
35+
"${UNIFI_DOWNLOAD}" && \
3636
unzip /tmp/unifi.zip -d /usr/lib && \
3737
mv /usr/lib/UniFi /usr/lib/unifi && \
3838
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \

‎Jenkinsfile‎

Lines changed: 76 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ pipeline {
147147
steps{
148148
script{
149149
env.EXT_RELEASE = sh(
150-
script: ''' curl -sX GET https://dl.ui.com/unifi/debian/dists/stable/ubiquiti/binary-amd64/Packages.gz | gunzip | grep -A 7 -m 1 'Package: unifi' | awk -F ': ' '/Version/{print $2;exit}' | awk -F '-' '{print $1}' ''',
150+
script: ''' curl -sX GET 'https://fw-update.ubnt.com/api/firmware-latest?filter=eq~~product~~unifi-controller&filter=eq~~platform~~unix&filter=eq~~channel~~release' | jq -r '._embedded.firmware[].version' | awk -F '+' '{print $1}' | tr -d 'v' ''',
151151
returnStdout: true).trim()
152152
env.RELEASE_LINK = 'custom_command'
153153
}
@@ -208,6 +208,7 @@ pipeline {
208208
env.META_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
209209
env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
210210
env.BUILDCACHE = 'docker.io/lsiodev/buildcache,registry.gitlab.com/linuxserver.io/docker-jenkins-builder/lsiodev-buildcache,ghcr.io/linuxserver/lsiodev-buildcache,quay.io/linuxserver.io/lsiodev-buildcache'
211+
env.CITEST_IMAGETAG = 'latest'
211212
}
212213
}
213214
}
@@ -233,6 +234,7 @@ pipeline {
233234
env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
234235
env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DEV_DOCKERHUB_IMAGE + '/tags/'
235236
env.BUILDCACHE = 'docker.io/lsiodev/buildcache,registry.gitlab.com/linuxserver.io/docker-jenkins-builder/lsiodev-buildcache,ghcr.io/linuxserver/lsiodev-buildcache,quay.io/linuxserver.io/lsiodev-buildcache'
237+
env.CITEST_IMAGETAG = 'develop'
236238
}
237239
}
238240
}
@@ -258,6 +260,7 @@ pipeline {
258260
env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/pull/' + env.PULL_REQUEST
259261
env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.PR_DOCKERHUB_IMAGE + '/tags/'
260262
env.BUILDCACHE = 'docker.io/lsiodev/buildcache,registry.gitlab.com/linuxserver.io/docker-jenkins-builder/lsiodev-buildcache,ghcr.io/linuxserver/lsiodev-buildcache,quay.io/linuxserver.io/lsiodev-buildcache'
263+
env.CITEST_IMAGETAG = 'develop'
261264
}
262265
}
263266
}
@@ -280,7 +283,7 @@ pipeline {
280283
-v ${WORKSPACE}:/mnt \
281284
-e AWS_ACCESS_KEY_ID=\"${S3_KEY}\" \
282285
-e AWS_SECRET_ACCESS_KEY=\"${S3_SECRET}\" \
283-
ghcr.io/linuxserver/baseimage-alpine:3.20 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
286+
ghcr.io/linuxserver/baseimage-alpine:3 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
284287
apk add --no-cache python3 && \
285288
python3 -m venv /lsiopy && \
286289
pip install --no-cache-dir -U pip && \
@@ -615,13 +618,16 @@ pipeline {
615618
echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
616619
echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
617620
echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
621+
618622
if [[ "${PACKAGE_CHECK}" != "true" ]]; then
623+
declare -A pids
619624
IFS=',' read -ra CACHE <<< "$BUILDCACHE"
620625
for i in "${CACHE[@]}"; do
621626
docker push ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} &
627+
pids[$!]="$i"
622628
done
623-
for p in $(jobs -p); do
624-
wait "$p" || { echo "job $p failed" >&2; exit 1; }
629+
for p in "${!pids[@]}"; do
630+
wait "$p" || { [[ "${pids[$p]}" != *"quay.io"* ]] && exit 1; }
625631
done
626632
fi
627633
'''
@@ -681,13 +687,16 @@ pipeline {
681687
echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
682688
echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
683689
echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
690+
684691
if [[ "${PACKAGE_CHECK}" != "true" ]]; then
692+
declare -A pids
685693
IFS=',' read -ra CACHE <<< "$BUILDCACHE"
686694
for i in "${CACHE[@]}"; do
687695
docker push ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} &
696+
pids[$!]="$i"
688697
done
689-
for p in $(jobs -p); do
690-
wait "$p" || { echo "job $p failed" >&2; exit 1; }
698+
for p in "${!pids[@]}"; do
699+
wait "$p" || { [[ "${pids[$p]}" != *"quay.io"* ]] && exit 1; }
691700
done
692701
fi
693702
'''
@@ -741,12 +750,14 @@ pipeline {
741750
echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
742751
echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
743752
if [[ "${PACKAGE_CHECK}" != "true" ]]; then
753+
declare -A pids
744754
IFS=',' read -ra CACHE <<< "$BUILDCACHE"
745755
for i in "${CACHE[@]}"; do
746756
docker push ${i}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} &
757+
pids[$!]="$i"
747758
done
748-
for p in $(jobs -p); do
749-
wait "$p" || { echo "job $p failed" >&2; exit 1; }
759+
for p in "${!pids[@]}"; do
760+
wait "$p" || { [[ "${pids[$p]}" != *"quay.io"* ]] && exit 1; }
750761
done
751762
fi
752763
'''
@@ -871,7 +882,7 @@ pipeline {
871882
CI_DOCKERENV="LSIO_FIRST_PARTY=true"
872883
fi
873884
fi
874-
docker pull ghcr.io/linuxserver/ci:latest
885+
docker pull ghcr.io/linuxserver/ci:${CITEST_IMAGETAG}
875886
if [ "${MULTIARCH}" == "true" ]; then
876887
docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} --platform=arm64
877888
docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
@@ -895,7 +906,9 @@ pipeline {
895906
-e WEB_PATH=\"${CI_WEBPATH}\" \
896907
-e NODE_NAME=\"${NODE_NAME}\" \
897908
-e SYFT_IMAGE_TAG=\"${CI_SYFT_IMAGE_TAG:-${SYFT_IMAGE_TAG}}\" \
898-
-t ghcr.io/linuxserver/ci:latest \
909+
-e COMMIT_SHA=\"${COMMIT_SHA}\" \
910+
-e BUILD_NUMBER=\"${BUILD_NUMBER}\" \
911+
-t ghcr.io/linuxserver/ci:${CITEST_IMAGETAG} \
899912
python3 test_build.py'''
900913
}
901914
}
@@ -921,9 +934,11 @@ pipeline {
921934
CACHEIMAGE=${i}
922935
fi
923936
done
924-
docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${META_TAG} -t ${PUSHIMAGE}:latest -t ${PUSHIMAGE}:${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
937+
docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${META_TAG} -t ${PUSHIMAGE}:latest -t ${PUSHIMAGE}:${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \
938+
{ if [[ "${PUSHIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
925939
if [ -n "${SEMVER}" ]; then
926-
docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
940+
docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \
941+
{ if [[ "${PUSHIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
927942
fi
928943
done
929944
'''
@@ -948,20 +963,27 @@ pipeline {
948963
CACHEIMAGE=${i}
949964
fi
950965
done
951-
docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${META_TAG} -t ${MANIFESTIMAGE}:amd64-latest -t ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
952-
docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${META_TAG} -t ${MANIFESTIMAGE}:arm64v8-latest -t ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
966+
docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${META_TAG} -t ${MANIFESTIMAGE}:amd64-latest -t ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \
967+
{ if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
968+
docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${META_TAG} -t ${MANIFESTIMAGE}:arm64v8-latest -t ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || \
969+
{ if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
953970
if [ -n "${SEMVER}" ]; then
954-
docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
955-
docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${SEMVER} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
971+
docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \
972+
{ if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
973+
docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${SEMVER} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || \
974+
{ if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
956975
fi
957976
done
958977
for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
959-
docker buildx imagetools create -t ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest
960-
docker buildx imagetools create -t ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
961-
962-
docker buildx imagetools create -t ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
978+
docker buildx imagetools create -t ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest || \
979+
{ if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
980+
docker buildx imagetools create -t ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} || \
981+
{ if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
982+
docker buildx imagetools create -t ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} || \
983+
{ if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
963984
if [ -n "${SEMVER}" ]; then
964-
docker buildx imagetools create -t ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
985+
docker buildx imagetools create -t ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} || \
986+
{ if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
965987
fi
966988
done
967989
'''
@@ -979,23 +1001,41 @@ pipeline {
9791001
environment name: 'EXIT_STATUS', value: ''
9801002
}
9811003
steps {
982-
echo "Pushing New tag for current commit ${META_TAG}"
983-
sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \
984-
-d '{"tag":"'${META_TAG}'",\
985-
"object": "'${COMMIT_SHA}'",\
986-
"message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to main",\
987-
"type": "commit",\
988-
"tagger": {"name": "LinuxServer-CI","email": "ci@linuxserver.io","date": "'${GITHUB_DATE}'"}}' '''
989-
echo "Pushing New release for Tag"
9901004
sh '''#! /bin/bash
1005+
echo "Auto-generating release notes"
1006+
if [ "$(git tag --points-at HEAD)" != "" ]; then
1007+
echo "Existing tag points to current commit, suggesting no new LS changes"
1008+
AUTO_RELEASE_NOTES="No changes"
1009+
else
1010+
AUTO_RELEASE_NOTES=$(curl -fsL -H "Authorization: token ${GITHUB_TOKEN}" -H "Accept: application/vnd.github+json" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases/generate-notes \
1011+
-d '{"tag_name":"'${META_TAG}'",\
1012+
"target_commitish": "main"}' \
1013+
| jq -r '.body' | sed 's|## What.s Changed||')
1014+
fi
1015+
echo "Pushing New tag for current commit ${META_TAG}"
1016+
curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \
1017+
-d '{"tag":"'${META_TAG}'",\
1018+
"object": "'${COMMIT_SHA}'",\
1019+
"message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to main",\
1020+
"type": "commit",\
1021+
"tagger": {"name": "LinuxServer-CI","email": "ci@linuxserver.io","date": "'${GITHUB_DATE}'"}}'
1022+
echo "Pushing New release for Tag"
9911023
echo "Updating to ${EXT_RELEASE_CLEAN}" > releasebody.json
992-
echo '{"tag_name":"'${META_TAG}'",\
993-
"target_commitish": "main",\
994-
"name": "'${META_TAG}'",\
995-
"body": "**CI Report:**\\n\\n'${CI_URL:-N/A}'\\n\\n**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**Remote Changes:**\\n\\n' > start
996-
printf '","draft": false,"prerelease": false}' >> releasebody.json
997-
paste -d'\\0' start releasebody.json > releasebody.json.done
998-
curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done'''
1024+
jq -n \
1025+
--arg tag_name "$META_TAG" \
1026+
--arg target_commitish "main" \
1027+
--arg ci_url "${CI_URL:-N/A}" \
1028+
--arg ls_notes "$AUTO_RELEASE_NOTES" \
1029+
--arg remote_notes "$(cat releasebody.json)" \
1030+
'{
1031+
"tag_name": $tag_name,
1032+
"target_commitish": $target_commitish,
1033+
"name": $tag_name,
1034+
"body": ("**CI Report:**\\n\\n" + $ci_url + "\\n\\n**LinuxServer Changes:**\\n\\n" + $ls_notes + "\\n\\n**Remote Changes:**\\n\\n" + $remote_notes),
1035+
"draft": false,
1036+
"prerelease": false }' > releasebody.json.done
1037+
curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done
1038+
'''
9991039
}
10001040
}
10011041
// Add protection to the release branch

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -416,6 +416,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
416416

417417
## Versions
418418

419+
* **20.10.25:** - Switch to using FW API endpoint for version checks.
419420
* **08.05.25:** - Update sample `init-mongo.sh` for compatibility with 9.1.120 (only affects new installs).
420421
* **13.02.25:** - Revert JRE to 17.
421422
* **12.02.25:** - Bump JRE to 21.

0 commit comments

Comments
 (0)