Skip to content

Make sure nginx.org repos are used in alpine-slim#1029

Merged
thresheek merged 2 commits intonginx:masterfrom
thresheek:make-sure-nginxorg
Mar 2, 2026
Merged

Make sure nginx.org repos are used in alpine-slim#1029
thresheek merged 2 commits intonginx:masterfrom
thresheek:make-sure-nginxorg

Conversation

@thresheek
Copy link
Copy Markdown
Member

Proposed changes

Currently, Alpine upstream repos ship the same version/release of nginx
as we do, which means apk prefers it over ours.

We make sure that the correct version is chosen by redefining what
repositories apk has at the invocation, but that means we need to
preinstall the dependencies, so let's do just that.

Currently, Alpine upstream repos ship the same version/release of nginx
as we do, which means apk prefers it over ours.

We make sure that the correct version is chosen by redefining what
repositories apk has at the invocation, but that means we need to
preinstall the dependencies, so let's do just that.
@thresheek thresheek requested a review from a team as a code owner February 28, 2026 03:01
@thresheek thresheek changed the title Make sure nginxorg Make sure nginx.org repos are used in alpine-slim Feb 28, 2026
@thresheek
Copy link
Copy Markdown
Member Author

I decided not to implement the same logic for the images based on the slim since modules have a requires=nginx-r$version which isnt provided by the Alpine upstream packages.

@thresheek
Copy link
Copy Markdown
Member Author

... And it fixes the issue spotted by CI in https://github.com/nginx/docker-nginx/actions/runs/22485098447/job/65216474252 - good thing we have tests! (and good thing Alpine's defaults arent the same as ours)

@thresheek thresheek merged commit 4b8282c into nginx:master Mar 2, 2026
10 checks passed
@thresheek thresheek deleted the make-sure-nginxorg branch March 2, 2026 19:57
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.

2 participants