Skip to content

Commit 94fa31d

Browse files
authored
Merge pull request #12 from linuxserver/alpine322-initial
Release alpine322 tag as new latest/stable
2 parents 4f1b72d + 035d64b commit 94fa31d

File tree

10 files changed

+70
-68
lines changed

10 files changed

+70
-68
lines changed

.github/CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
## Readme
2525

2626
If you would like to change our readme, please __**do not**__ directly edit the readme, as it is auto-generated on each commit.
27-
Instead edit the [readme-vars.yml](https://github.com/linuxserver/docker-python/edit/alpine321/readme-vars.yml).
27+
Instead edit the [readme-vars.yml](https://github.com/linuxserver/docker-python/edit/alpine322/readme-vars.yml).
2828

2929
These variables are used in a template for our [Jenkins Builder](https://github.com/linuxserver/docker-jenkins-builder) as part of an ansible play.
3030
Most of these variables are also carried over to [docs.linuxserver.io](https://docs.linuxserver.io)
@@ -115,7 +115,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
115115

116116
## Update the changelog
117117

118-
If you are modifying the Dockerfiles or any of the startup scripts in [root](https://github.com/linuxserver/docker-python/tree/alpine321/root), add an entry to the changelog
118+
If you are modifying the Dockerfiles or any of the startup scripts in [root](https://github.com/linuxserver/docker-python/tree/alpine322/root), add an entry to the changelog
119119

120120
```yml
121121
changelogs:

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
------------------------------
2323

24-
- [ ] I have read the [contributing](https://github.com/linuxserver/docker-python/blob/alpine321/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications
24+
- [ ] I have read the [contributing](https://github.com/linuxserver/docker-python/blob/alpine322/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications
2525

2626
------------------------------
2727

.github/workflows/external_trigger.yml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,39 +4,39 @@ on:
44
workflow_dispatch:
55

66
jobs:
7-
external-trigger-alpine321:
7+
external-trigger-alpine322:
88
runs-on: ubuntu-latest
99
steps:
1010
- uses: actions/checkout@v4.1.1
1111

1212
- name: External Trigger
13-
if: github.ref == 'refs/heads/alpine321'
13+
if: github.ref == 'refs/heads/alpine322'
1414
env:
1515
SKIP_EXTERNAL_TRIGGER: ${{ vars.SKIP_EXTERNAL_TRIGGER }}
1616
run: |
1717
printf "# External trigger for docker-python\n\n" >> $GITHUB_STEP_SUMMARY
18-
if grep -q "^python_alpine321_" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
18+
if grep -q "^python_alpine322_" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
1919
echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
20-
echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`python_alpine321_\`; will skip trigger if version matches." >> $GITHUB_STEP_SUMMARY
21-
elif grep -q "^python_alpine321" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
20+
echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`python_alpine322_\`; will skip trigger if version matches." >> $GITHUB_STEP_SUMMARY
21+
elif grep -q "^python_alpine322" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
2222
echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
23-
echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`python_alpine321\`; skipping trigger." >> $GITHUB_STEP_SUMMARY
23+
echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`python_alpine322\`; skipping trigger." >> $GITHUB_STEP_SUMMARY
2424
exit 0
2525
fi
2626
echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
27-
echo "> External trigger running off of alpine321 branch. To disable this trigger, add \`python_alpine321\` into the Github organizational variable \`SKIP_EXTERNAL_TRIGGER\`." >> $GITHUB_STEP_SUMMARY
27+
echo "> External trigger running off of alpine322 branch. To disable this trigger, add \`python_alpine322\` into the Github organizational variable \`SKIP_EXTERNAL_TRIGGER\`." >> $GITHUB_STEP_SUMMARY
2828
printf "\n## Retrieving external version\n\n" >> $GITHUB_STEP_SUMMARY
2929
EXT_RELEASE=$(curl -u ${{ secrets.CR_USER }}:${{ secrets.CR_PAT }} -sX GET https://api.github.com/repos/python/cpython/tags | jq -r '.[] | select(.name | contains("rc") or contains("a") or contains("b") | not) | .name' | sed 's|^v||g' | sort -rV | head -1)
3030
echo "Type is \`custom_version_command\`" >> $GITHUB_STEP_SUMMARY
31-
if grep -q "^python_alpine321_${EXT_RELEASE}" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
31+
if grep -q "^python_alpine322_${EXT_RELEASE}" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
3232
echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
3333
echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` matches current external release; skipping trigger." >> $GITHUB_STEP_SUMMARY
3434
exit 0
3535
fi
3636
if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
3737
echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
3838
echo "> Can't retrieve external version, exiting" >> $GITHUB_STEP_SUMMARY
39-
FAILURE_REASON="Can't retrieve external version for python branch alpine321"
39+
FAILURE_REASON="Can't retrieve external version for python branch alpine322"
4040
GHA_TRIGGER_URL="https://github.com/linuxserver/docker-python/actions/runs/${{ github.run_id }}"
4141
curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680,
4242
"description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n**Trigger URL:** '"${GHA_TRIGGER_URL}"' \n"}],
@@ -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/python"
50-
tag="alpine321"
50+
tag="alpine322"
5151
token=$(curl -sX GET \
5252
"https://ghcr.io/token?scope=repository%3Alinuxserver%2Fpython%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 python tag alpine321"
96+
FAILURE_REASON="Can't retrieve last pushed version for python tag alpine322"
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 }}
@@ -103,14 +103,14 @@ jobs:
103103
if [ "${EXT_RELEASE}" == "${IMAGE_VERSION}" ]; then
104104
echo "Version \`${EXT_RELEASE}\` already pushed, exiting" >> $GITHUB_STEP_SUMMARY
105105
exit 0
106-
elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-python/job/alpine321/lastBuild/api/json | jq -r '.building') == "true" ]; then
106+
elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-python/job/alpine322/lastBuild/api/json | jq -r '.building') == "true" ]; then
107107
echo "New version \`${EXT_RELEASE}\` found; but there already seems to be an active build on Jenkins; exiting" >> $GITHUB_STEP_SUMMARY
108108
exit 0
109109
else
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 python tag alpine321 is detected, however not all artifacts are uploaded to upstream release yet. Will try again later."
113+
FAILURE_REASON="New version ${EXT_RELEASE} for python tag alpine322 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 }}
@@ -121,7 +121,7 @@ jobs:
121121
echo "All artifacts seem to be uploaded." >> $GITHUB_STEP_SUMMARY
122122
fi
123123
response=$(curl -iX POST \
124-
https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-python/job/alpine321/buildWithParameters?PACKAGE_CHECK=false \
124+
https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-python/job/alpine322/buildWithParameters?PACKAGE_CHECK=false \
125125
--user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
126126
echo "Jenkins [job queue url](${response%$'\r'})" >> $GITHUB_STEP_SUMMARY
127127
echo "Sleeping 10 seconds until job starts" >> $GITHUB_STEP_SUMMARY
@@ -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 python tag alpine321. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE}"
139+
TRIGGER_REASON="A version change was detected for python tag alpine322. 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 }}

.github/workflows/greetings.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ jobs:
99
- uses: actions/first-interaction@v1
1010
with:
1111
issue-message: 'Thanks for opening your first issue here! Be sure to follow the relevant issue templates, or risk having this issue marked as invalid.'
12-
pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-python/blob/alpine321/.github/PULL_REQUEST_TEMPLATE.md)!'
12+
pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-python/blob/alpine322/.github/PULL_REQUEST_TEMPLATE.md)!'
1313
repo-token: ${{ secrets.GITHUB_TOKEN }}

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1
22

3-
FROM ghcr.io/linuxserver/baseimage-alpine:3.21 as buildstage
3+
FROM ghcr.io/linuxserver/baseimage-alpine:3.22 AS buildstage
44

55
# set version label
66
ARG PYTHON_VERSION

Dockerfile.aarch64

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1
22

3-
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.21 as buildstage
3+
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.22 AS buildstage
44

55
# set version label
66
ARG PYTHON_VERSION

0 commit comments

Comments
 (0)