Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update mainline to Alpine 3.20 #894

Merged
merged 2 commits into from
Aug 14, 2024

Conversation

jnoordsij
Copy link
Contributor

Proposed changes

Updates the mainline image to use Alpine 3.20 as default version. See also https://alpinelinux.org/posts/Alpine-3.20.0-released.html.

Note: given that this requires built binaries for the new Alpine version and won't take any effect until an actual new release of nginx itself, this PR is intentionally marked as draft, so it can function both as a heads-up about the new release (in anticipation of new mainline release that will probably appear soon?) and a place that allows for subscription to any potential updates. It can then be merged later at any convenient time when everything is ready. However, if it is still preferable to close this in the meantime, feel free to do so.

Checklist

Before creating a PR, run through this checklist and mark each as complete:

  • I have read the CONTRIBUTING document
  • I have run ./update.sh and ensured all entrypoint/Dockerfile template changes have been applied to the relevant image entrypoint scripts & Dockerfiles
  • If applicable, I have added tests that prove my fix is effective or that my feature works
  • If applicable, I have checked that any relevant tests pass after adding my changes
  • I have updated any relevant documentation

@jnoordsij jnoordsij marked this pull request as draft May 22, 2024 12:53
@jnoordsij jnoordsij mentioned this pull request May 22, 2024
5 tasks
@jnoordsij jnoordsij marked this pull request as ready for review May 29, 2024 15:11
@jnoordsij
Copy link
Contributor Author

Should be ready for 1.27.0 release once the Alpine binaries are available!

@mmoll
Copy link

mmoll commented May 30, 2024

AFAICT what's missing are Alpine 3.20 builds in the apk repo for x86 and aarch64 and for a build from source to succeed something like (or better than) this:

diff --git a/mainline/alpine-slim/Dockerfile b/mainline/alpine-slim/Dockerfile
index 370879b..302670f 100644
--- a/mainline/alpine-slim/Dockerfile
+++ b/mainline/alpine-slim/Dockerfile
@@ -53,6 +53,7 @@ RUN set -x \
                 bash \
                 alpine-sdk \
                 findutils \
+                curl \
             && su nobody -s /bin/sh -c " \
                 export HOME=${tempDir} \
                 && cd ${tempDir} \
@@ -68,7 +69,7 @@ RUN set -x \
                 && cd pkg-oss-${NGINX_VERSION}-${PKG_RELEASE} \
                 && cd alpine \
                 && make base \
-                && apk index -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \
+                && apk index --allow-untrusted -o ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz ${tempDir}/packages/alpine/${apkArch}/*.apk \
                 && abuild-sign -k ${tempDir}/.abuild/abuild-key.rsa ${tempDir}/packages/alpine/${apkArch}/APKINDEX.tar.gz \
                 " \
             && cp ${tempDir}/.abuild/abuild-key.rsa.pub /etc/apk/keys/ \

@thresheek
Copy link
Collaborator

We are working on providing alpine-3.20 builds on nginx.org, no other changes will be necessary.

@sciku1
Copy link

sciku1 commented Jun 6, 2024

@thresheek is there any open ticket to track this work? Keen to get this updated!

@jnoordsij jnoordsij force-pushed the mainline-alpine-3.20 branch from 0cda471 to d07bb0c Compare August 14, 2024 15:42
@jnoordsij
Copy link
Contributor Author

@thresheek do you intend to include this (and #895) with the next tagged releases that just popped up?

I noticed the built packages are there now, but when trying to update the version tags myself to get the builds working, I run into what seems to me as an inconsistency with package patchlevel versions (e.g. https://nginx.org/packages//mainline/alpine/v3.20/main/x86_64/nginx-1.27.1-r1.apk vs https://nginx.org/packages//mainline/alpine/v3.20/main/x86_64/nginx-module-geoip-1.27.1-r2.apk), so I couldn't include the version bumps just yet.

@thresheek
Copy link
Collaborator

Thanks @jnoordsij - it seems like the version unbump was forgotten for the built-in modules...

@thresheek
Copy link
Collaborator

I think I've got a fix; I intend to include a bump to 3.20 for both mainline and stable, once PR/jobs for version bump succeed.

@thresheek
Copy link
Collaborator

thresheek commented Aug 14, 2024

Hey @jnoordsij may I ask you to rebase against current again? thanks

Nevermind I think I can do it myself

@thresheek thresheek force-pushed the mainline-alpine-3.20 branch from d07bb0c to 666d119 Compare August 14, 2024 21:35
@thresheek thresheek force-pushed the mainline-alpine-3.20 branch from c0ca7fa to 5c65a91 Compare August 14, 2024 21:49
@thresheek thresheek merged commit 2396849 into nginxinc:master Aug 14, 2024
9 checks passed
@thresheek
Copy link
Collaborator

Merged, thank you!

@jnoordsij jnoordsij deleted the mainline-alpine-3.20 branch August 15, 2024 06:15
@jnoordsij jnoordsij mentioned this pull request Dec 5, 2024
5 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants