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.

Sign up for GitHub

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

Jump to bottom

patch base images on container build #4869

Merged
merged 2 commits into from Jan 5, 2024
Merged

patch base images on container build #4869

merged 2 commits into from Jan 5, 2024

Conversation

pdabelf5
Copy link
Collaborator

@pdabelf5 pdabelf5 commented Jan 5, 2024 •
edited

Proposed changes

Patch the base images with the latest OS updates before publishing.

Checklist

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

  • I have read the CONTRIBUTING doc
  • I have added tests that prove my fix is effective or that my feature works
  • I have checked that all unit tests pass after adding my changes
  • I have updated necessary documentation
  • I have rebased my branch onto main
  • I will ensure my PR is targeting the main branch and pulling from my branch from my own fork

@pdabelf5 pdabelf5 requested a review from a team as a code owner January 5, 2024 09:48
@pdabelf5 pdabelf5 self-assigned this Jan 5, 2024
@pdabelf5 pdabelf5 added this to the v3.5.0 milestone Jan 5, 2024
@pdabelf5 pdabelf5 linked an issue Jan 5, 2024 that may be closed by this pull request
Fix code scanning alert - curl: excessively long file name may lead to unknown HSTS status #4867
Closed
1 task
shaun-nx
shaun-nx approved these changes Jan 5, 2024
View reviewed changes
Copy link
Contributor

@shaun-nx shaun-nx left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👏

@pdabelf5 pdabelf5 merged commit d0dd2a1 into main Jan 5, 2024
75 checks passed
@pdabelf5 pdabelf5 deleted the patching-base-images branch January 5, 2024 12:54
pdabelf5 added a commit that referenced this pull request Jan 12, 2024
@pdabelf5
patch base images on container build (#4869)
f494117
pdabelf5 added a commit that referenced this pull request Jan 12, 2024
@pdabelf5 @haywoodsh
@lucacome @oseoin @vepatel @dependabot
Cherry pick 3.4.1 (#4886)
a376068 
* fix release script for helm (#4810)

Signed-off-by: Haywood Shannon <5781935+haywoodsh@users.noreply.github.com>

* Test jobs further refactor (#4820)

* Fix AWS registry (#4825)

* Don't push Marketplace images (#4827)

* Add the ability to have Nginx version checks in templates (#4831)

Add the ability to add version dependent template elements

* Add trigger for GCP Marketplace repo (#4829)

* Add automatic push to GCP Marketplace (#4828)

* Update N+ to R31 (#4850)

* Bump the go group with 3 updates (#4846)

Bumps the go group with 3 updates: [github.com/aws/aws-sdk-go-v2/config](https://github.com/aws/aws-sdk-go-v2), [github.com/go-chi/chi/v5](https://github.com/go-chi/chi) and [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang).


Updates `github.com/aws/aws-sdk-go-v2/config` from 1.26.1 to 1.26.2
- [Release notes](https://github.com/aws/aws-sdk-go-v2/releases)
- [Commits](aws/aws-sdk-go-v2@config/v1.26.1...config/v1.26.2)

Updates `github.com/go-chi/chi/v5` from 5.0.10 to 5.0.11
- [Release notes](https://github.com/go-chi/chi/releases)
- [Changelog](https://github.com/go-chi/chi/blob/master/CHANGELOG.md)
- [Commits](go-chi/chi@v5.0.10...v5.0.11)

Updates `github.com/prometheus/client_golang` from 1.17.0 to 1.18.0
- [Release notes](https://github.com/prometheus/client_golang/releases)
- [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md)
- [Commits](prometheus/client_golang@v1.17.0...v1.18.0)

---
updated-dependencies:
- dependency-name: github.com/aws/aws-sdk-go-v2/config
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: go
- dependency-name: github.com/go-chi/chi/v5
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: go
- dependency-name: github.com/prometheus/client_golang
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: go
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Report User Agent for Alpine and UBI (#4845)

* Bump the go group with 2 updates (#4873)

Bumps the go group with 2 updates: [github.com/aws/aws-sdk-go-v2/config](https://github.com/aws/aws-sdk-go-v2) and [github.com/aws/aws-sdk-go-v2/service/marketplacemetering](https://github.com/aws/aws-sdk-go-v2).


Updates `github.com/aws/aws-sdk-go-v2/config` from 1.26.2 to 1.26.3
- [Release notes](https://github.com/aws/aws-sdk-go-v2/releases)
- [Commits](aws/aws-sdk-go-v2@config/v1.26.2...config/v1.26.3)

Updates `github.com/aws/aws-sdk-go-v2/service/marketplacemetering` from 1.19.5 to 1.19.6
- [Release notes](https://github.com/aws/aws-sdk-go-v2/releases)
- [Commits](aws/aws-sdk-go-v2@service/mq/v1.19.5...service/efs/v1.19.6)

---
updated-dependencies:
- dependency-name: github.com/aws/aws-sdk-go-v2/config
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: go
- dependency-name: github.com/aws/aws-sdk-go-v2/service/marketplacemetering
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: go
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Paul Abel <128620221+pdabelf5@users.noreply.github.com>

* Update UBI string for new images (#4893)

* Bump the go group with 1 update (#4905)

Bumps the go group with 1 update: [github.com/nginxinc/nginx-prometheus-exporter](https://github.com/nginxinc/nginx-prometheus-exporter).


Updates `github.com/nginxinc/nginx-prometheus-exporter` from 1.0.0 to 1.1.0
- [Release notes](https://github.com/nginxinc/nginx-prometheus-exporter/releases)
- [Changelog](https://github.com/nginxinc/nginx-prometheus-exporter/blob/main/CHANGELOG.md)
- [Commits](nginxinc/nginx-prometheus-exporter@v1.0.0...v1.1.0)

---
updated-dependencies:
- dependency-name: github.com/nginxinc/nginx-prometheus-exporter
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: go
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Paul Abel <128620221+pdabelf5@users.noreply.github.com>

* patch base images on container build (#4869)

---------

Signed-off-by: Haywood Shannon <5781935+haywoodsh@users.noreply.github.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Haywood Shannon <5781935+haywoodsh@users.noreply.github.com>
Co-authored-by: Luca Comellini <luca.com@gmail.com>
Co-authored-by: oseoin <oseoin@users.noreply.github.com>
Co-authored-by: Venktesh Shivam Patel <ve.patel@f5.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@oseoin oseoin oseoin approved these changes

@j1m-ryan j1m-ryan j1m-ryan approved these changes

@vepatel vepatel vepatel approved these changes

@jjngx jjngx jjngx approved these changes

@shaun-nx shaun-nx shaun-nx approved these changes

Assignees

@pdabelf5 pdabelf5

Labels
None yet
Projects
NGINX Ingress Controller
Status: Done 🚀
Milestone
v3.5.0
Development

Successfully merging this pull request may close these issues.

Fix code scanning alert - curl: excessively long file name may lead to unknown HSTS status
6 participants
@pdabelf5 @oseoin @j1m-ryan @vepatel @jjngx @shaun-nx