Skip to content

Commit 1328410

Browse files
thelamerthelamer
committed
build 42 on master
1 parent 0ca9c31 commit 1328410

File tree

7 files changed

+27
-27
lines changed

7 files changed

+27
-27
lines changed

‎.github/ISSUE_TEMPLATE/issue.bug.yml‎

100755100644
File mode changed.

‎.github/ISSUE_TEMPLATE/issue.feature.yml‎

100755100644
File mode changed.

‎.github/workflows/call_issue_pr_tracker.yml‎

100755100644
File mode changed.

‎.github/workflows/call_issues_cron.yml‎

100755100644
File mode changed.

‎.github/workflows/external_trigger.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
2727
echo "> External trigger running off of master branch. To disable this trigger, add \`baseimage-fedora_master\` into the Github organizational variable \`SKIP_EXTERNAL_TRIGGER\`." >> $GITHUB_STEP_SUMMARY
2828
printf "\n## Retrieving external version\n\n" >> $GITHUB_STEP_SUMMARY
29-
EXT_RELEASE=$(echo 41)
29+
EXT_RELEASE=$(echo 42)
3030
echo "Type is \`custom_version_command\`" >> $GITHUB_STEP_SUMMARY
3131
if grep -q "^baseimage-fedora_master_${EXT_RELEASE}" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
3232
echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
@@ -47,7 +47,7 @@ jobs:
4747
echo "External version: \`${EXT_RELEASE}\`" >> $GITHUB_STEP_SUMMARY
4848
echo "Retrieving last pushed version" >> $GITHUB_STEP_SUMMARY
4949
image="linuxserver/baseimage-fedora"
50-
tag="41"
50+
tag="42"
5151
token=$(curl -sX GET \
5252
"https://ghcr.io/token?scope=repository%3Alinuxserver%2Fbaseimage-fedora%3Apull" \
5353
| jq -r '.token')
@@ -93,7 +93,7 @@ jobs:
9393
if [ -z "${IMAGE_VERSION}" ]; then
9494
echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
9595
echo "Can't retrieve last pushed version, exiting" >> $GITHUB_STEP_SUMMARY
96-
FAILURE_REASON="Can't retrieve last pushed version for baseimage-fedora tag 41"
96+
FAILURE_REASON="Can't retrieve last pushed version for baseimage-fedora tag 42"
9797
curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680,
9898
"description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}],
9999
"username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
@@ -110,7 +110,7 @@ jobs:
110110
if [[ "${artifacts_found}" == "false" ]]; then
111111
echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
112112
echo "> New version detected, but not all artifacts are published yet; skipping trigger" >> $GITHUB_STEP_SUMMARY
113-
FAILURE_REASON="New version ${EXT_RELEASE} for baseimage-fedora tag 41 is detected, however not all artifacts are uploaded to upstream release yet. Will try again later."
113+
FAILURE_REASON="New version ${EXT_RELEASE} for baseimage-fedora tag 42 is detected, however not all artifacts are uploaded to upstream release yet. Will try again later."
114114
curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
115115
"description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}],
116116
"username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
@@ -136,7 +136,7 @@ jobs:
136136
--data-urlencode "description=GHA external trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
137137
--data-urlencode "Submit=Submit"
138138
echo "**** Notifying Discord ****"
139-
TRIGGER_REASON="A version change was detected for baseimage-fedora tag 41. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE}"
139+
TRIGGER_REASON="A version change was detected for baseimage-fedora tag 42. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE}"
140140
curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
141141
"description": "**Build Triggered** \n**Reason:** '"${TRIGGER_REASON}"' \n**Build URL:** '"${buildurl}display/redirect"' \n"}],
142142
"username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}

‎Jenkinsfile‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ pipeline {
7676
script{
7777
env.EXIT_STATUS = ''
7878
env.LS_RELEASE = sh(
79-
script: '''docker run --rm quay.io/skopeo/stable:v1 inspect docker://ghcr.io/${LS_USER}/${CONTAINER_NAME}:41 2>/dev/null | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''',
79+
script: '''docker run --rm quay.io/skopeo/stable:v1 inspect docker://ghcr.io/${LS_USER}/${CONTAINER_NAME}:42 2>/dev/null | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''',
8080
returnStdout: true).trim()
8181
env.LS_RELEASE_NOTES = sh(
8282
script: '''cat readme-vars.yml | awk -F \\" '/date: "[0-9][0-9].[0-9][0-9].[0-9][0-9]:/ {print $4;exit;}' | sed -E ':a;N;$!ba;s/\\r{0,1}\\n/\\\\n/g' ''',
@@ -105,7 +105,7 @@ pipeline {
105105
script{
106106
env.LS_TAG_NUMBER = sh(
107107
script: '''#! /bin/bash
108-
tagsha=$(git rev-list -n 1 41-${LS_RELEASE} 2>/dev/null)
108+
tagsha=$(git rev-list -n 1 42-${LS_RELEASE} 2>/dev/null)
109109
if [ "${tagsha}" == "${COMMIT_SHA}" ]; then
110110
echo ${LS_RELEASE_NUMBER}
111111
elif [ -z "${GIT_COMMIT}" ]; then
@@ -143,7 +143,7 @@ pipeline {
143143
steps{
144144
script{
145145
env.EXT_RELEASE = sh(
146-
script: ''' echo 41 ''',
146+
script: ''' echo 42 ''',
147147
returnStdout: true).trim()
148148
env.RELEASE_LINK = 'custom_command'
149149
}
@@ -196,13 +196,13 @@ pipeline {
196196
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/' + env.CONTAINER_NAME
197197
env.QUAYIMAGE = 'quay.io/linuxserver.io/' + env.CONTAINER_NAME
198198
if (env.MULTIARCH == 'true') {
199-
env.CI_TAGS = 'amd64-41-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-41-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
199+
env.CI_TAGS = 'amd64-42-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-42-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
200200
} else {
201-
env.CI_TAGS = '41-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
201+
env.CI_TAGS = '42-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
202202
}
203203
env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
204-
env.META_TAG = '41-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
205-
env.EXT_RELEASE_TAG = '41-version-' + env.EXT_RELEASE_CLEAN
204+
env.META_TAG = '42-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
205+
env.EXT_RELEASE_TAG = '42-version-' + env.EXT_RELEASE_CLEAN
206206
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'
207207
}
208208
}
@@ -220,13 +220,13 @@ pipeline {
220220
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME
221221
env.QUAYIMAGE = 'quay.io/linuxserver.io/lsiodev-' + env.CONTAINER_NAME
222222
if (env.MULTIARCH == 'true') {
223-
env.CI_TAGS = 'amd64-41-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-41-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
223+
env.CI_TAGS = 'amd64-42-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-42-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
224224
} else {
225-
env.CI_TAGS = '41-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
225+
env.CI_TAGS = '42-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
226226
}
227227
env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
228-
env.META_TAG = '41-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
229-
env.EXT_RELEASE_TAG = '41-version-' + env.EXT_RELEASE_CLEAN
228+
env.META_TAG = '42-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
229+
env.EXT_RELEASE_TAG = '42-version-' + env.EXT_RELEASE_CLEAN
230230
env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DEV_DOCKERHUB_IMAGE + '/tags/'
231231
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'
232232
}
@@ -244,13 +244,13 @@ pipeline {
244244
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME
245245
env.QUAYIMAGE = 'quay.io/linuxserver.io/lspipepr-' + env.CONTAINER_NAME
246246
if (env.MULTIARCH == 'true') {
247-
env.CI_TAGS = 'amd64-41-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|arm64v8-41-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
247+
env.CI_TAGS = 'amd64-42-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|arm64v8-42-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
248248
} else {
249-
env.CI_TAGS = '41-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
249+
env.CI_TAGS = '42-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
250250
}
251251
env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
252-
env.META_TAG = '41-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
253-
env.EXT_RELEASE_TAG = '41-version-' + env.EXT_RELEASE_CLEAN
252+
env.META_TAG = '42-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
253+
env.EXT_RELEASE_TAG = '42-version-' + env.EXT_RELEASE_CLEAN
254254
env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/pull/' + env.PULL_REQUEST
255255
env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.PR_DOCKERHUB_IMAGE + '/tags/'
256256
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'
@@ -813,7 +813,7 @@ pipeline {
813813
-e DOCKER_LOGS_TIMEOUT=\"${CI_DELAY}\" \
814814
-e TAGS=\"${CI_TAGS}\" \
815815
-e META_TAG=\"${META_TAG}\" \
816-
-e RELEASE_TAG=\"41\" \
816+
-e RELEASE_TAG=\"42\" \
817817
-e PORT=\"${CI_PORT}\" \
818818
-e SSL=\"${CI_SSL}\" \
819819
-e BASE=\"${DIST_IMAGE}\" \
@@ -850,7 +850,7 @@ pipeline {
850850
CACHEIMAGE=${i}
851851
fi
852852
done
853-
docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${META_TAG} -t ${PUSHIMAGE}:41 -t ${PUSHIMAGE}:${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
853+
docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${META_TAG} -t ${PUSHIMAGE}:42 -t ${PUSHIMAGE}:${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
854854
if [ -n "${SEMVER}" ]; then
855855
docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
856856
fi
@@ -877,15 +877,15 @@ pipeline {
877877
CACHEIMAGE=${i}
878878
fi
879879
done
880-
docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${META_TAG} -t ${MANIFESTIMAGE}:amd64-41 -t ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
881-
docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${META_TAG} -t ${MANIFESTIMAGE}:arm64v8-41 -t ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
880+
docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${META_TAG} -t ${MANIFESTIMAGE}:amd64-42 -t ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
881+
docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${META_TAG} -t ${MANIFESTIMAGE}:arm64v8-42 -t ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
882882
if [ -n "${SEMVER}" ]; then
883883
docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
884884
docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${SEMVER} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
885885
fi
886886
done
887887
for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
888-
docker buildx imagetools create -t ${MANIFESTIMAGE}:41 ${MANIFESTIMAGE}:amd64-41 ${MANIFESTIMAGE}:arm64v8-41
888+
docker buildx imagetools create -t ${MANIFESTIMAGE}:42 ${MANIFESTIMAGE}:amd64-42 ${MANIFESTIMAGE}:arm64v8-42
889889
docker buildx imagetools create -t ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
890890
891891
docker buildx imagetools create -t ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}

‎jenkins-vars.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
# jenkins variables
44
project_name: docker-baseimage-fedora
55
external_type: na
6-
custom_version_command: "echo 41"
6+
custom_version_command: "echo 42"
77
release_type: stable
8-
release_tag: "41"
8+
release_tag: "42"
99
ls_branch: master
1010
repo_vars:
1111
- BUILD_VERSION_ARG = 'FEDORA_VERSION'

0 commit comments

Comments
 (0)