Skip to content

Commit 583649b

Browse files
thespadthespad
authored
Merge pull request #47 from linuxserver/41-initial
2 parents 2d49c65 + 09c62d8 commit 583649b

File tree

3 files changed

+27
-29
lines changed

3 files changed

+27
-29
lines changed

‎.github/workflows/external_trigger.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
2424
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
2525
printf "\n## Retrieving external version\n\n" >> $GITHUB_STEP_SUMMARY
26-
EXT_RELEASE=$(echo 40)
26+
EXT_RELEASE=$(echo 41)
2727
echo "Type is \`custom_version_command\`" >> $GITHUB_STEP_SUMMARY
2828
if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
2929
echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
@@ -39,7 +39,7 @@ jobs:
3939
echo "External version: \`${EXT_RELEASE}\`" >> $GITHUB_STEP_SUMMARY
4040
echo "Retrieving last pushed version" >> $GITHUB_STEP_SUMMARY
4141
image="linuxserver/baseimage-fedora"
42-
tag="40"
42+
tag="41"
4343
token=$(curl -sX GET \
4444
"https://ghcr.io/token?scope=repository%3Alinuxserver%2Fbaseimage-fedora%3Apull" \
4545
| jq -r '.token')
@@ -85,7 +85,7 @@ jobs:
8585
if [ -z "${IMAGE_VERSION}" ]; then
8686
echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
8787
echo "Can't retrieve last pushed version, exiting" >> $GITHUB_STEP_SUMMARY
88-
FAILURE_REASON="Can't retrieve last pushed version for baseimage-fedora tag 40"
88+
FAILURE_REASON="Can't retrieve last pushed version for baseimage-fedora tag 41"
8989
curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680,
9090
"description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}],
9191
"username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
@@ -102,7 +102,7 @@ jobs:
102102
if [[ "${artifacts_found}" == "false" ]]; then
103103
echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
104104
echo "> New version detected, but not all artifacts are published yet; skipping trigger" >> $GITHUB_STEP_SUMMARY
105-
FAILURE_REASON="New version ${EXT_RELEASE} for baseimage-fedora tag 40 is detected, however not all artifacts are uploaded to upstream release yet. Will try again later."
105+
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."
106106
curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
107107
"description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}],
108108
"username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
@@ -128,7 +128,7 @@ jobs:
128128
--data-urlencode "description=GHA external trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
129129
--data-urlencode "Submit=Submit"
130130
echo "**** Notifying Discord ****"
131-
TRIGGER_REASON="A version change was detected for baseimage-fedora tag 40. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE}"
131+
TRIGGER_REASON="A version change was detected for baseimage-fedora tag 41. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE}"
132132
curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
133133
"description": "**Build Triggered** \n**Reason:** '"${TRIGGER_REASON}"' \n**Build URL:** '"${buildurl}display/redirect"' \n"}],
134134
"username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}

‎Jenkinsfile‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ pipeline {
6464
script{
6565
env.EXIT_STATUS = ''
6666
env.LS_RELEASE = sh(
67-
script: '''docker run --rm quay.io/skopeo/stable:v1 inspect docker://ghcr.io/${LS_USER}/${CONTAINER_NAME}:40 2>/dev/null | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''',
67+
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' || : ''',
6868
returnStdout: true).trim()
6969
env.LS_RELEASE_NOTES = sh(
7070
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' ''',
@@ -93,7 +93,7 @@ pipeline {
9393
script{
9494
env.LS_TAG_NUMBER = sh(
9595
script: '''#! /bin/bash
96-
tagsha=$(git rev-list -n 1 40-${LS_RELEASE} 2>/dev/null)
96+
tagsha=$(git rev-list -n 1 41-${LS_RELEASE} 2>/dev/null)
9797
if [ "${tagsha}" == "${COMMIT_SHA}" ]; then
9898
echo ${LS_RELEASE_NUMBER}
9999
elif [ -z "${GIT_COMMIT}" ]; then
@@ -131,7 +131,7 @@ pipeline {
131131
steps{
132132
script{
133133
env.EXT_RELEASE = sh(
134-
script: ''' echo 40 ''',
134+
script: ''' echo 41 ''',
135135
returnStdout: true).trim()
136136
env.RELEASE_LINK = 'custom_command'
137137
}
@@ -184,13 +184,13 @@ pipeline {
184184
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/' + env.CONTAINER_NAME
185185
env.QUAYIMAGE = 'quay.io/linuxserver.io/' + env.CONTAINER_NAME
186186
if (env.MULTIARCH == 'true') {
187-
env.CI_TAGS = 'amd64-40-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-40-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
187+
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
188188
} else {
189-
env.CI_TAGS = '40-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
189+
env.CI_TAGS = '41-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
190190
}
191191
env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
192-
env.META_TAG = '40-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
193-
env.EXT_RELEASE_TAG = '40-version-' + env.EXT_RELEASE_CLEAN
192+
env.META_TAG = '41-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
193+
env.EXT_RELEASE_TAG = '41-version-' + env.EXT_RELEASE_CLEAN
194194
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'
195195
}
196196
}
@@ -208,13 +208,13 @@ pipeline {
208208
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME
209209
env.QUAYIMAGE = 'quay.io/linuxserver.io/lsiodev-' + env.CONTAINER_NAME
210210
if (env.MULTIARCH == 'true') {
211-
env.CI_TAGS = 'amd64-40-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-40-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
211+
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
212212
} else {
213-
env.CI_TAGS = '40-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
213+
env.CI_TAGS = '41-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
214214
}
215215
env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
216-
env.META_TAG = '40-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
217-
env.EXT_RELEASE_TAG = '40-version-' + env.EXT_RELEASE_CLEAN
216+
env.META_TAG = '41-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
217+
env.EXT_RELEASE_TAG = '41-version-' + env.EXT_RELEASE_CLEAN
218218
env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DEV_DOCKERHUB_IMAGE + '/tags/'
219219
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'
220220
}
@@ -232,13 +232,13 @@ pipeline {
232232
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME
233233
env.QUAYIMAGE = 'quay.io/linuxserver.io/lspipepr-' + env.CONTAINER_NAME
234234
if (env.MULTIARCH == 'true') {
235-
env.CI_TAGS = 'amd64-40-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|arm64v8-40-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
235+
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
236236
} else {
237-
env.CI_TAGS = '40-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
237+
env.CI_TAGS = '41-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
238238
}
239239
env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
240-
env.META_TAG = '40-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
241-
env.EXT_RELEASE_TAG = '40-version-' + env.EXT_RELEASE_CLEAN
240+
env.META_TAG = '41-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
241+
env.EXT_RELEASE_TAG = '41-version-' + env.EXT_RELEASE_CLEAN
242242
env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/pull/' + env.PULL_REQUEST
243243
env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.PR_DOCKERHUB_IMAGE + '/tags/'
244244
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'
@@ -800,7 +800,7 @@ pipeline {
800800
-e DOCKER_LOGS_TIMEOUT=\"${CI_DELAY}\" \
801801
-e TAGS=\"${CI_TAGS}\" \
802802
-e META_TAG=\"${META_TAG}\" \
803-
-e RELEASE_TAG=\"40\" \
803+
-e RELEASE_TAG=\"41\" \
804804
-e PORT=\"${CI_PORT}\" \
805805
-e SSL=\"${CI_SSL}\" \
806806
-e BASE=\"${DIST_IMAGE}\" \
@@ -837,7 +837,7 @@ pipeline {
837837
CACHEIMAGE=${i}
838838
fi
839839
done
840-
docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${META_TAG} -t ${PUSHIMAGE}:40 -t ${PUSHIMAGE}:${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
840+
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}
841841
if [ -n "${SEMVER}" ]; then
842842
docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
843843
fi
@@ -864,15 +864,15 @@ pipeline {
864864
CACHEIMAGE=${i}
865865
fi
866866
done
867-
docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${META_TAG} -t ${MANIFESTIMAGE}:amd64-40 -t ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
868-
docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${META_TAG} -t ${MANIFESTIMAGE}:arm64v8-40 -t ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
867+
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}
868+
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}
869869
if [ -n "${SEMVER}" ]; then
870870
docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
871871
docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${SEMVER} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
872872
fi
873873
done
874874
for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
875-
docker buildx imagetools create -t ${MANIFESTIMAGE}:40 ${MANIFESTIMAGE}:amd64-40 ${MANIFESTIMAGE}:arm64v8-40
875+
docker buildx imagetools create -t ${MANIFESTIMAGE}:41 ${MANIFESTIMAGE}:amd64-41 ${MANIFESTIMAGE}:arm64v8-41
876876
docker buildx imagetools create -t ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
877877
878878
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 & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,10 @@
33
# jenkins variables
44
project_name: docker-baseimage-fedora
55
external_type: na
6-
custom_version_command: "echo 40"
6+
custom_version_command: "echo 41"
77
release_type: stable
8-
release_tag: "40"
8+
release_tag: "41"
99
ls_branch: master
10-
image_sbom: true
11-
image_provenance: true
1210
repo_vars:
1311
- BUILD_VERSION_ARG = 'FEDORA_VERSION'
1412
- LS_USER = 'linuxserver'

0 commit comments

Comments
 (0)