Skip to content

Commit 85cbc7c

Browse files
aptalcaaptalca
authored
Merge pull request #74 from linuxserver/3.13-master
bumping master to 3.13
2 parents 0c1e360 + 3cfd389 commit 85cbc7c

File tree

7 files changed

+36
-36
lines changed

7 files changed

+36
-36
lines changed

‎.github/workflows/greetings.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ jobs:
88
steps:
99
- uses: actions/first-interaction@v1
1010
with:
11-
issue-message: 'Thanks for opening your first issue here! Be sure to follow the [issue template](https://github.com/linuxserver/docker-baseimage-alpine-nginx/blob/master/.github/ISSUE_TEMPLATE.md)!'
11+
issue-message: 'Thanks for opening your first issue here! Be sure to follow the [bug](https://github.com/linuxserver/docker-baseimage-alpine-nginx/blob/master/.github/ISSUE_TEMPLATE/issue.bug.md) or [feature](https://github.com/linuxserver/docker-baseimage-alpine-nginx/blob/master/.github/ISSUE_TEMPLATE/issue.feature.md) issue templates!'
1212
pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-baseimage-alpine-nginx/blob/master/.github/PULL_REQUEST_TEMPLATE.md)!'
1313
repo-token: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/package_trigger_scheduler.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Package Trigger Scheduler
22

33
on:
44
schedule:
5-
- cron: '01 6 * * 6'
5+
- cron: '43 5 * * 4'
66
workflow_dispatch:
77

88
jobs:

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/linuxserver/baseimage-alpine:3.12
1+
FROM ghcr.io/linuxserver/baseimage-alpine:3.13
22

33
# install packages
44
RUN \

‎Dockerfile.aarch64‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.12
1+
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.13
22

33
# install packages
44
RUN \

‎Dockerfile.armhf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.12
1+
FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.13
22

33
# install packages
44
RUN \

‎Jenkinsfile‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ pipeline {
4141
script{
4242
env.EXIT_STATUS = ''
4343
env.LS_RELEASE = sh(
44-
script: '''docker run --rm ghcr.io/linuxserver/alexeiled-skopeo sh -c 'skopeo inspect docker://docker.io/'${DOCKERHUB_IMAGE}':3.12 2>/dev/null' | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''',
44+
script: '''docker run --rm ghcr.io/linuxserver/alexeiled-skopeo sh -c 'skopeo inspect docker://docker.io/'${DOCKERHUB_IMAGE}':3.13 2>/dev/null' | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''',
4545
returnStdout: true).trim()
4646
env.LS_RELEASE_NOTES = sh(
4747
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' ''',
@@ -129,13 +129,13 @@ pipeline {
129129
env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/' + env.CONTAINER_NAME
130130
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/' + env.CONTAINER_NAME
131131
if (env.MULTIARCH == 'true') {
132-
env.CI_TAGS = 'amd64-3.12-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm32v7-3.12-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-3.12-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
132+
env.CI_TAGS = 'amd64-3.13-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm32v7-3.13-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-3.13-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
133133
} else {
134-
env.CI_TAGS = '3.12-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
134+
env.CI_TAGS = '3.13-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
135135
}
136136
env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
137-
env.META_TAG = '3.12-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
138-
env.EXT_RELEASE_TAG = '3.12-version-' + env.EXT_RELEASE_CLEAN
137+
env.META_TAG = '3.13-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
138+
env.EXT_RELEASE_TAG = '3.13-version-' + env.EXT_RELEASE_CLEAN
139139
}
140140
}
141141
}
@@ -151,13 +151,13 @@ pipeline {
151151
env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/lsiodev-' + env.CONTAINER_NAME
152152
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME
153153
if (env.MULTIARCH == 'true') {
154-
env.CI_TAGS = 'amd64-3.12-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm32v7-3.12-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-3.12-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
154+
env.CI_TAGS = 'amd64-3.13-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm32v7-3.13-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-3.13-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
155155
} else {
156-
env.CI_TAGS = '3.12-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
156+
env.CI_TAGS = '3.13-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
157157
}
158158
env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
159-
env.META_TAG = '3.12-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
160-
env.EXT_RELEASE_TAG = '3.12-version-' + env.EXT_RELEASE_CLEAN
159+
env.META_TAG = '3.13-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
160+
env.EXT_RELEASE_TAG = '3.13-version-' + env.EXT_RELEASE_CLEAN
161161
env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DEV_DOCKERHUB_IMAGE + '/tags/'
162162
}
163163
}
@@ -173,13 +173,13 @@ pipeline {
173173
env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/lspipepr-' + env.CONTAINER_NAME
174174
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME
175175
if (env.MULTIARCH == 'true') {
176-
env.CI_TAGS = 'amd64-3.12-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm32v7-3.12-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm64v8-3.12-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
176+
env.CI_TAGS = 'amd64-3.13-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm32v7-3.13-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm64v8-3.13-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
177177
} else {
178-
env.CI_TAGS = '3.12-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
178+
env.CI_TAGS = '3.13-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
179179
}
180180
env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
181-
env.META_TAG = '3.12-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
182-
env.EXT_RELEASE_TAG = '3.12-version-' + env.EXT_RELEASE_CLEAN
181+
env.META_TAG = '3.13-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
182+
env.EXT_RELEASE_TAG = '3.13-version-' + env.EXT_RELEASE_CLEAN
183183
env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/pull/' + env.PULL_REQUEST
184184
env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.PR_DOCKERHUB_IMAGE + '/tags/'
185185
}
@@ -253,7 +253,7 @@ pipeline {
253253
fi
254254
mkdir -p ${TEMPDIR}/gitbook
255255
git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/gitbook/docker-documentation
256-
if [[ "${BRANCH_NAME}" == "master" ]] && [[ (! -f ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then
256+
if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then
257257
cp ${TEMPDIR}/docker-${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md ${TEMPDIR}/gitbook/docker-documentation/images/
258258
cd ${TEMPDIR}/gitbook/docker-documentation/
259259
git add images/docker-${CONTAINER_NAME}.md
@@ -535,9 +535,9 @@ pipeline {
535535
echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
536536
for PUSHIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
537537
docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG}
538-
docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:3.12
538+
docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:3.13
539539
docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${EXT_RELEASE_TAG}
540-
docker push ${PUSHIMAGE}:3.12
540+
docker push ${PUSHIMAGE}:3.13
541541
docker push ${PUSHIMAGE}:${META_TAG}
542542
docker push ${PUSHIMAGE}:${EXT_RELEASE_TAG}
543543
done
@@ -548,7 +548,7 @@ pipeline {
548548
docker rmi \
549549
${DELETEIMAGE}:${META_TAG} \
550550
${DELETEIMAGE}:${EXT_RELEASE_TAG} \
551-
${DELETEIMAGE}:3.12 || :
551+
${DELETEIMAGE}:3.13 || :
552552
done
553553
'''
554554
}
@@ -585,25 +585,25 @@ pipeline {
585585
docker tag ${IMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG}
586586
docker tag ${IMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG}
587587
docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
588-
docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-3.12
589-
docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-3.12
590-
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-3.12
588+
docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-3.13
589+
docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-3.13
590+
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-3.13
591591
docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
592592
docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
593593
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
594594
docker push ${MANIFESTIMAGE}:amd64-${META_TAG}
595595
docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG}
596596
docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
597-
docker push ${MANIFESTIMAGE}:amd64-3.12
598-
docker push ${MANIFESTIMAGE}:arm32v7-3.12
599-
docker push ${MANIFESTIMAGE}:arm64v8-3.12
597+
docker push ${MANIFESTIMAGE}:amd64-3.13
598+
docker push ${MANIFESTIMAGE}:arm32v7-3.13
599+
docker push ${MANIFESTIMAGE}:arm64v8-3.13
600600
docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
601601
docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
602602
docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
603-
docker manifest push --purge ${MANIFESTIMAGE}:3.12 || :
604-
docker manifest create ${MANIFESTIMAGE}:3.12 ${MANIFESTIMAGE}:amd64-3.12 ${MANIFESTIMAGE}:arm32v7-3.12 ${MANIFESTIMAGE}:arm64v8-3.12
605-
docker manifest annotate ${MANIFESTIMAGE}:3.12 ${MANIFESTIMAGE}:arm32v7-3.12 --os linux --arch arm
606-
docker manifest annotate ${MANIFESTIMAGE}:3.12 ${MANIFESTIMAGE}:arm64v8-3.12 --os linux --arch arm64 --variant v8
603+
docker manifest push --purge ${MANIFESTIMAGE}:3.13 || :
604+
docker manifest create ${MANIFESTIMAGE}:3.13 ${MANIFESTIMAGE}:amd64-3.13 ${MANIFESTIMAGE}:arm32v7-3.13 ${MANIFESTIMAGE}:arm64v8-3.13
605+
docker manifest annotate ${MANIFESTIMAGE}:3.13 ${MANIFESTIMAGE}:arm32v7-3.13 --os linux --arch arm
606+
docker manifest annotate ${MANIFESTIMAGE}:3.13 ${MANIFESTIMAGE}:arm64v8-3.13 --os linux --arch arm64 --variant v8
607607
docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} || :
608608
docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
609609
docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} --os linux --arch arm
@@ -612,7 +612,7 @@ pipeline {
612612
docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
613613
docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} --os linux --arch arm
614614
docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8
615-
docker manifest push --purge ${MANIFESTIMAGE}:3.12
615+
docker manifest push --purge ${MANIFESTIMAGE}:3.13
616616
docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG}
617617
docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG}
618618
done
@@ -622,10 +622,10 @@ pipeline {
622622
for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
623623
docker rmi \
624624
${DELETEIMAGE}:arm32v7-${META_TAG} \
625-
${DELETEIMAGE}:arm32v7-3.12 \
625+
${DELETEIMAGE}:arm32v7-3.13 \
626626
${DELETEIMAGE}:arm32v7-${EXT_RELEASE_TAG} \
627627
${DELETEIMAGE}:arm64v8-${META_TAG} \
628-
${DELETEIMAGE}:arm64v8-3.12 \
628+
${DELETEIMAGE}:arm64v8-3.13 \
629629
${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} || :
630630
done
631631
docker rmi \

‎jenkins-vars.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
project_name: docker-baseimage-alpine-nginx
55
external_type: os
66
release_type: stable
7-
release_tag: "3.12"
7+
release_tag: "3.13"
88
ls_branch: master
99
repo_vars:
1010
- BUILD_VERSION_ARG = 'OS'

0 commit comments

Comments
 (0)