Skip to content

Commit 93bf13d

Browse files
thespadthespad
authored
Merge pull request #189 from linuxserver/3.23-initial
2 parents 081f800 + 11d6f9b commit 93bf13d

15 files changed

Lines changed: 132 additions & 132 deletions

File tree

‎.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-baseimage-alpine-nginx/edit/3.22/readme-vars.yml).
27+
Instead edit the [readme-vars.yml](https://github.com/linuxserver/docker-baseimage-alpine-nginx/edit/3.23/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-baseimage-alpine-nginx/tree/3.22/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-baseimage-alpine-nginx/tree/3.23/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-baseimage-alpine-nginx/blob/3.22/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications
24+
- [ ] I have read the [contributing](https://github.com/linuxserver/docker-baseimage-alpine-nginx/blob/3.23/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications
2525

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

‎.github/workflows/external_trigger.yml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,39 +7,39 @@ permissions:
77
contents: read
88

99
jobs:
10-
external-trigger-3-22:
10+
external-trigger-3-23:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- uses: actions/[email protected]
1414

1515
- name: External Trigger
16-
if: github.ref == 'refs/heads/3.22'
16+
if: github.ref == 'refs/heads/3.23'
1717
env:
1818
SKIP_EXTERNAL_TRIGGER: ${{ vars.SKIP_EXTERNAL_TRIGGER }}
1919
run: |
2020
printf "# External trigger for docker-baseimage-alpine-nginx\n\n" >> $GITHUB_STEP_SUMMARY
21-
if grep -q "^baseimage-alpine-nginx_3.22_" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
21+
if grep -q "^baseimage-alpine-nginx_3.23_" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
2222
echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
23-
echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`baseimage-alpine-nginx_3.22_\`; will skip trigger if version matches." >> $GITHUB_STEP_SUMMARY
24-
elif grep -q "^baseimage-alpine-nginx_3.22" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
23+
echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`baseimage-alpine-nginx_3.23_\`; will skip trigger if version matches." >> $GITHUB_STEP_SUMMARY
24+
elif grep -q "^baseimage-alpine-nginx_3.23" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
2525
echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
26-
echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`baseimage-alpine-nginx_3.22\`; skipping trigger." >> $GITHUB_STEP_SUMMARY
26+
echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`baseimage-alpine-nginx_3.23\`; skipping trigger." >> $GITHUB_STEP_SUMMARY
2727
exit 0
2828
fi
2929
echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
30-
echo "> External trigger running off of 3.22 branch. To disable this trigger, add \`baseimage-alpine-nginx_3.22\` into the Github organizational variable \`SKIP_EXTERNAL_TRIGGER\`." >> $GITHUB_STEP_SUMMARY
30+
echo "> External trigger running off of 3.23 branch. To disable this trigger, add \`baseimage-alpine-nginx_3.23\` 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=$(echo $(curl -sL http://dl-cdn.alpinelinux.org/alpine/v3.22/main/x86_64/APKINDEX.tar.gz | tar -xz -C /tmp && awk '/^P:'"nginx"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://')_$(curl -sL http://dl-cdn.alpinelinux.org/alpine/v3.22/community/x86_64/APKINDEX.tar.gz | tar -xz -C /tmp && awk '/^P:'"php84"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'))
32+
EXT_RELEASE=$(echo $(curl -sL http://dl-cdn.alpinelinux.org/alpine/v3.23/main/x86_64/APKINDEX.tar.gz | tar -xz -C /tmp && awk '/^P:'"nginx"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://')_$(curl -sL http://dl-cdn.alpinelinux.org/alpine/v3.23/community/x86_64/APKINDEX.tar.gz | tar -xz -C /tmp && awk '/^P:'"php84"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'))
3333
echo "Type is \`custom_version_command\`" >> $GITHUB_STEP_SUMMARY
34-
if grep -q "^baseimage-alpine-nginx_3.22_${EXT_RELEASE}" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
34+
if grep -q "^baseimage-alpine-nginx_3.23_${EXT_RELEASE}" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
3535
echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
3636
echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` matches current external release; skipping trigger." >> $GITHUB_STEP_SUMMARY
3737
exit 0
3838
fi
3939
if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
4040
echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
4141
echo "> Can't retrieve external version, exiting" >> $GITHUB_STEP_SUMMARY
42-
FAILURE_REASON="Can't retrieve external version for baseimage-alpine-nginx branch 3.22"
42+
FAILURE_REASON="Can't retrieve external version for baseimage-alpine-nginx branch 3.23"
4343
GHA_TRIGGER_URL="https://github.com/linuxserver/docker-baseimage-alpine-nginx/actions/runs/${{ github.run_id }}"
4444
curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680,
4545
"description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n**Trigger URL:** '"${GHA_TRIGGER_URL}"' \n"}],
@@ -50,7 +50,7 @@ jobs:
5050
echo "Sanitized external version: \`${EXT_RELEASE_SANITIZED}\`" >> $GITHUB_STEP_SUMMARY
5151
echo "Retrieving last pushed version" >> $GITHUB_STEP_SUMMARY
5252
image="linuxserver/baseimage-alpine-nginx"
53-
tag="3.22"
53+
tag="3.23"
5454
token=$(curl -sX GET \
5555
"https://ghcr.io/token?scope=repository%3Alinuxserver%2Fbaseimage-alpine-nginx%3Apull" \
5656
| jq -r '.token')
@@ -96,7 +96,7 @@ jobs:
9696
if [ -z "${IMAGE_VERSION}" ]; then
9797
echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
9898
echo "Can't retrieve last pushed version, exiting" >> $GITHUB_STEP_SUMMARY
99-
FAILURE_REASON="Can't retrieve last pushed version for baseimage-alpine-nginx tag 3.22"
99+
FAILURE_REASON="Can't retrieve last pushed version for baseimage-alpine-nginx tag 3.23"
100100
curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680,
101101
"description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}],
102102
"username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
@@ -106,14 +106,14 @@ jobs:
106106
if [ "${EXT_RELEASE_SANITIZED}" == "${IMAGE_VERSION}" ]; then
107107
echo "Sanitized version \`${EXT_RELEASE_SANITIZED}\` already pushed, exiting" >> $GITHUB_STEP_SUMMARY
108108
exit 0
109-
elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-baseimage-alpine-nginx/job/3.22/lastBuild/api/json | jq -r '.building') == "true" ]; then
109+
elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-baseimage-alpine-nginx/job/3.23/lastBuild/api/json | jq -r '.building') == "true" ]; then
110110
echo "New version \`${EXT_RELEASE}\` found; but there already seems to be an active build on Jenkins; exiting" >> $GITHUB_STEP_SUMMARY
111111
exit 0
112112
else
113113
if [[ "${artifacts_found}" == "false" ]]; then
114114
echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
115115
echo "> New version detected, but not all artifacts are published yet; skipping trigger" >> $GITHUB_STEP_SUMMARY
116-
FAILURE_REASON="New version ${EXT_RELEASE} for baseimage-alpine-nginx tag 3.22 is detected, however not all artifacts are uploaded to upstream release yet. Will try again later."
116+
FAILURE_REASON="New version ${EXT_RELEASE} for baseimage-alpine-nginx tag 3.23 is detected, however not all artifacts are uploaded to upstream release yet. Will try again later."
117117
curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
118118
"description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}],
119119
"username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
@@ -124,7 +124,7 @@ jobs:
124124
echo "All artifacts seem to be uploaded." >> $GITHUB_STEP_SUMMARY
125125
fi
126126
response=$(curl -iX POST \
127-
https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-baseimage-alpine-nginx/job/3.22/buildWithParameters?PACKAGE_CHECK=false \
127+
https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-baseimage-alpine-nginx/job/3.23/buildWithParameters?PACKAGE_CHECK=false \
128128
--user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
129129
echo "Jenkins [job queue url](${response%$'\r'})" >> $GITHUB_STEP_SUMMARY
130130
echo "Sleeping 10 seconds until job starts" >> $GITHUB_STEP_SUMMARY
@@ -139,7 +139,7 @@ jobs:
139139
--data-urlencode "description=GHA external trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
140140
--data-urlencode "Submit=Submit"
141141
echo "**** Notifying Discord ****"
142-
TRIGGER_REASON="A version change was detected for baseimage-alpine-nginx tag 3.22. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE_SANITIZED}"
142+
TRIGGER_REASON="A version change was detected for baseimage-alpine-nginx tag 3.23. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE_SANITIZED}"
143143
curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
144144
"description": "**Build Triggered** \n**Reason:** '"${TRIGGER_REASON}"' \n**Build URL:** '"${buildurl}display/redirect"' \n"}],
145145
"username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}

‎.github/workflows/greetings.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ jobs:
1515
- uses: actions/first-interaction@v1
1616
with:
1717
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.'
18-
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/3.22/.github/PULL_REQUEST_TEMPLATE.md)!'
18+
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/3.23/.github/PULL_REQUEST_TEMPLATE.md)!'
1919
repo-token: ${{ secrets.GITHUB_TOKEN }}

‎Dockerfile‎

Lines changed: 24 additions & 24 deletions
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.22
3+
FROM ghcr.io/linuxserver/baseimage-alpine:3.23
44

55
# set version label
66
ARG BUILD_DATE
@@ -20,22 +20,22 @@ RUN \
2020
nano \
2121
nginx \
2222
openssl \
23-
php84 \
24-
php84-ctype \
25-
php84-curl \
26-
php84-fileinfo \
27-
php84-fpm \
28-
php84-iconv \
29-
php84-json \
30-
php84-mbstring \
31-
php84-openssl \
32-
php84-phar \
33-
php84-session \
34-
php84-simplexml \
35-
php84-xml \
36-
php84-xmlwriter \
37-
php84-zip \
38-
php84-zlib && \
23+
php85 \
24+
php85-ctype \
25+
php85-curl \
26+
php85-fileinfo \
27+
php85-fpm \
28+
php85-iconv \
29+
php85-json \
30+
php85-mbstring \
31+
php85-openssl \
32+
php85-phar \
33+
php85-session \
34+
php85-simplexml \
35+
php85-xml \
36+
php85-xmlwriter \
37+
php85-zip \
38+
php85-zlib && \
3939
echo "**** configure nginx ****" && \
4040
echo 'fastcgi_param HTTP_PROXY ""; # https://httpoxy.org/' >> \
4141
/etc/nginx/fastcgi_params && \
@@ -48,19 +48,19 @@ RUN \
4848
rm -f /etc/nginx/conf.d/stream.conf && \
4949
rm -f /etc/nginx/http.d/default.conf && \
5050
echo "**** guarantee correct php version is symlinked ****" && \
51-
if [ "$(readlink /usr/bin/php)" != "php84" ]; then \
51+
if [ "$(readlink /usr/bin/php)" != "php85" ]; then \
5252
rm -rf /usr/bin/php && \
53-
ln -s /usr/bin/php84 /usr/bin/php; \
53+
ln -s /usr/bin/php85 /usr/bin/php; \
5454
fi && \
5555
echo "**** configure php ****" && \
56-
sed -i "s#;error_log = log/php84/error.log.*#error_log = /config/log/php/error.log#g" \
57-
/etc/php84/php-fpm.conf && \
56+
sed -i "s#;error_log = log/php85/error.log.*#error_log = /config/log/php/error.log#g" \
57+
/etc/php85/php-fpm.conf && \
5858
sed -i "s#user = nobody.*#user = abc#g" \
59-
/etc/php84/php-fpm.d/www.conf && \
59+
/etc/php85/php-fpm.d/www.conf && \
6060
sed -i "s#group = nobody.*#group = abc#g" \
61-
/etc/php84/php-fpm.d/www.conf && \
61+
/etc/php85/php-fpm.d/www.conf && \
6262
echo "**** add run paths to php runtime config ****" && \
63-
grep -qxF 'include=/config/php/*.conf' /etc/php84/php-fpm.conf || echo 'include=/config/php/*.conf' >> /etc/php84/php-fpm.conf && \
63+
grep -qxF 'include=/config/php/*.conf' /etc/php85/php-fpm.conf || echo 'include=/config/php/*.conf' >> /etc/php85/php-fpm.conf && \
6464
echo "**** install php composer ****" && \
6565
EXPECTED_CHECKSUM="$(php -r 'copy("https://composer.github.io/installer.sig", "php://stdout");')" && \
6666
php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" && \

‎Dockerfile.aarch64‎

Lines changed: 24 additions & 24 deletions
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.22
3+
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.23
44

55
# set version label
66
ARG BUILD_DATE
@@ -20,22 +20,22 @@ RUN \
2020
nano \
2121
nginx \
2222
openssl \
23-
php84 \
24-
php84-ctype \
25-
php84-curl \
26-
php84-fileinfo \
27-
php84-fpm \
28-
php84-iconv \
29-
php84-json \
30-
php84-mbstring \
31-
php84-openssl \
32-
php84-phar \
33-
php84-session \
34-
php84-simplexml \
35-
php84-xml \
36-
php84-xmlwriter \
37-
php84-zip \
38-
php84-zlib && \
23+
php85 \
24+
php85-ctype \
25+
php85-curl \
26+
php85-fileinfo \
27+
php85-fpm \
28+
php85-iconv \
29+
php85-json \
30+
php85-mbstring \
31+
php85-openssl \
32+
php85-phar \
33+
php85-session \
34+
php85-simplexml \
35+
php85-xml \
36+
php85-xmlwriter \
37+
php85-zip \
38+
php85-zlib && \
3939
echo "**** configure nginx ****" && \
4040
echo 'fastcgi_param HTTP_PROXY ""; # https://httpoxy.org/' >> \
4141
/etc/nginx/fastcgi_params && \
@@ -48,19 +48,19 @@ RUN \
4848
rm -f /etc/nginx/conf.d/stream.conf && \
4949
rm -f /etc/nginx/http.d/default.conf && \
5050
echo "**** guarantee correct php version is symlinked ****" && \
51-
if [ "$(readlink /usr/bin/php)" != "php84" ]; then \
51+
if [ "$(readlink /usr/bin/php)" != "php85" ]; then \
5252
rm -rf /usr/bin/php && \
53-
ln -s /usr/bin/php84 /usr/bin/php; \
53+
ln -s /usr/bin/php85 /usr/bin/php; \
5454
fi && \
5555
echo "**** configure php ****" && \
56-
sed -i "s#;error_log = log/php84/error.log.*#error_log = /config/log/php/error.log#g" \
57-
/etc/php84/php-fpm.conf && \
56+
sed -i "s#;error_log = log/php85/error.log.*#error_log = /config/log/php/error.log#g" \
57+
/etc/php85/php-fpm.conf && \
5858
sed -i "s#user = nobody.*#user = abc#g" \
59-
/etc/php84/php-fpm.d/www.conf && \
59+
/etc/php85/php-fpm.d/www.conf && \
6060
sed -i "s#group = nobody.*#group = abc#g" \
61-
/etc/php84/php-fpm.d/www.conf && \
61+
/etc/php85/php-fpm.d/www.conf && \
6262
echo "**** add run paths to php runtime config ****" && \
63-
grep -qxF 'include=/config/php/*.conf' /etc/php84/php-fpm.conf || echo 'include=/config/php/*.conf' >> /etc/php84/php-fpm.conf && \
63+
grep -qxF 'include=/config/php/*.conf' /etc/php85/php-fpm.conf || echo 'include=/config/php/*.conf' >> /etc/php85/php-fpm.conf && \
6464
echo "**** install php composer ****" && \
6565
EXPECTED_CHECKSUM="$(php -r 'copy("https://composer.github.io/installer.sig", "php://stdout");')" && \
6666
php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" && \

0 commit comments

Comments
 (0)