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

Build base images for OSS #4999

Merged
merged 20 commits into from Jan 30, 2024
Merged

Build base images for OSS #4999

merged 20 commits into from Jan 30, 2024

Conversation

oseoin
Copy link
Contributor

@oseoin oseoin commented Jan 29, 2024

Proposed changes

Builds the common target for each OS/flavour which will be consumed in a later PR. This will avoid rebuilding the same layers for each new branch and should reduce cache usage (and hopefully reduce cache 429s as a result). The tags used include a trimmed version of the hash of the dockerfile + version file, which means that any branch consuming these images will use the correct version for the current state of the branch.

This has been tested with a manual trigger of the workflow, which resulted in the following images being built and stored:

OSS:
gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-base/oss:d41d8cd9-debian
gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-base/oss:d41d8cd9-alpine
gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-base/oss:d41d8cd9-ubi

Plus:
gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-base/plus:d41d8cd9-debian-plus
gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-base/plus:d41d8cd9-ubi-plus
gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-base/plus:d41d8cd9-alpine-plus
gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-base/plus:d41d8cd9-alpine-plus-fips

NAP:
gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-base/plus:d41d8cd9-debian-plus-nap-dos
gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-base/plus:d41d8cd9-debian-plus-nap-waf
gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-base/plus:d41d8cd9-debian-plus-nap-waf-dos
gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-base/plus:d41d8cd9-alpine-plus-nap-fips-waf
gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-base/plus:d41d8cd9-ubi-9-plus-nap-waf
gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-base/plus:d41d8cd9-ubi-8-plus-nap-dos
gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-base/plus:d41d8cd9-ubi-8-plus-nap-waf-dos

This PR also renames alpine-plus-nap-waf-fips to alpine-plus-nap-fips for consistency - this is only used internally and will not impact the name of released images.

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

Copy link

codecov bot commented Jan 29, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (515a7e3) 52.31% compared to head (bb6f86f) 52.28%.
Report is 14 commits behind head on main.

❗ Current head bb6f86f differs from pull request most recent head 4a6119a. Consider uploading reports for the commit 4a6119a to get more accurate results

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #4999      +/-   ##
==========================================
- Coverage   52.31%   52.28%   -0.03%     
==========================================
  Files          60       60              
  Lines       17501    17501              
==========================================
- Hits         9155     9151       -4     
- Misses       8018     8020       +2     
- Partials      328      330       +2     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@oseoin oseoin marked this pull request as ready for review January 30, 2024 11:44
@oseoin oseoin requested a review from a team as a code owner January 30, 2024 11:44
@oseoin oseoin merged commit f1bfec2 into main Jan 30, 2024
76 checks passed
@oseoin oseoin deleted the prebuild-base-images branch January 30, 2024 16:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done 🚀
Development

Successfully merging this pull request may close these issues.

None yet

5 participants