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

Fix make image targets #812

Merged
merged 1 commit into from
Sep 2, 2024
Merged

Fix make image targets #812

merged 1 commit into from
Sep 2, 2024

Conversation

dhurley
Copy link
Collaborator

@dhurley dhurley commented Aug 29, 2024

Proposed changes

  • Update make image & make oss-image to take a NGINX_AGENT_VERSION argument
  • Update make oss-image to take a IMAGE_BUILD_TARGET argument
  • Fix postinstall script error when running on SUSE OS (awk wasn't installed so I used cut instead)

Can now call make targets like this now:

IMAGE_BUILD_TARGET=install-agent-repo NGINX_AGENT_VERSION=2.37.0 OS_RELEASE=alpine OS_VERSION=3.20 make oss-image
NGINX_AGENT_VERSION=2.37.0 OS_RELEASE=alpine OS_VERSION=3.20 make image

Checklist

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

  • I have read the CONTRIBUTING document
  • I have run make install-tools and have attached any dependency changes to this pull request
  • 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
  • If applicable, I have updated any relevant documentation (README.md)
  • If applicable, I have tested my cross-platform changes on Ubuntu 22, Redhat 8, SUSE 15 and FreeBSD 13

@dhurley dhurley added the v2.x Issues and Pull Requests related to the major version v2 label Aug 29, 2024
@dhurley dhurley self-assigned this Aug 29, 2024
@github-actions github-actions bot added the bug Something isn't working label Aug 29, 2024
@nginx-seanmoloney nginx-seanmoloney merged commit 1cb8688 into main Sep 2, 2024
38 checks passed
@nginx-seanmoloney nginx-seanmoloney deleted the fix-make-image-targets branch September 2, 2024 15:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working v2.x Issues and Pull Requests related to the major version v2
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants