fix: update NGINX Plus Dockerfile #274
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 tasks
4141done
reviewed
Jun 26, 2024
|
|
||
| ENTRYPOINT ["/docker-entrypoint.sh"] | ||
| # Download your NGINX license certificate and key from the F5 customer portal (https://account.f5.com) and copy it to the build context |
There was a problem hiding this comment.
I wouldn't be sure what where I need to put my files based on this comment. I know we supply build context as the last argument to docker build so does that mean that if I supply . then this file expects my license files to be in the current dir?
There was a problem hiding this comment.
You would pass the location via the src parameter in --secret id=nginx-crt,src=plus/etc/ssl/nginx/nginx-repo.crt.
| gpg1 --export "$NGINX_GPGKEY" > "$NGINX_GPGKEY_PATH" ; \ | ||
| rm -rf "$GNUPGHOME"; \ | ||
| apt-get remove --purge --auto-remove -y gnupg1 && rm -rf /var/lib/apt/lists/*; \ | ||
| echo "deb [signed-by=/etc/apt/keyrings/nginx-archive-keyring.gpg] https://nginx.org/packages/mainline/debian/ $(echo $PKG_RELEASE | cut -f2 -d~) nginx" >> /etc/apt/sources.list.d/nginx.list; \ |
There was a problem hiding this comment.
Any particular reason we're removing this? Did the official nginx image GPG keys get updated?
There was a problem hiding this comment.
They did! All three keys (including the new two ones) are now part of the official image and the two new keys do not expire (in theory).
4141done
approved these changes
Jul 10, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Proposed changes
This PR refactors the NGINX Plus Dockerfile by using the NGINX Plus Dockerfile found here gist.github.com/nginx-gists/36e97fc87efb5cf0039978c8e41a34b5 as a starting point.
This PR also refactors the various ENV instructions in both the NGINX OSS and NGINX Plus Dockerfiles to use the new guidelines where the key=value pair is separated by "=" instead of a whitespace.
Checklist
Before creating a PR, run through this checklist and mark each as complete:
README.md).