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

Specify a custom container registry #970

Merged
merged 27 commits into from
Aug 26, 2024
Merged

Specify a custom container registry #970

merged 27 commits into from
Aug 26, 2024

Conversation

Luigi96
Copy link
Contributor

@Luigi96 Luigi96 commented Aug 2, 2024

This pull request introduces support for specifying a custom container registry across various build and test tasks in the project. The changes ensure that the container registry can be set dynamically and used consistently throughout the build and test processes.

Container Registry Support:

  • linux/build.gradle: Added methods getContainerRegistry and setBuildArgs to manage container registry and build arguments.

@Luigi96
Use defined images
7aba7e9
@Luigi96
Add container registry property
7f39d84
@Luigi96
Fix mispell of buildArgs
30f7e77
@Luigi96
Try simpifing buildArgs
d9ee331
@Luigi96
Fix build arg
154f67c
@Luigi96
Print container registry and build args
f35393f
@Luigi96
Use container registry arg in gosu
53aa384
@Luigi96
Set container registry without build-args
6498a0e
@Luigi96
Fix adding build arguments
0ada1d6
@Luigi96
Add container registry argument to dockerfiles and docker build cmds
58a9e83
@Luigi96
Add container registry property to RedHat tests
c1b65d3
@Luigi96
Print container registry
214cb4d
@Luigi96
Use environment variable to set registry
0f608fc
@Luigi96
Debug container registry
033aaea
@Luigi96
Print container registry on gradle for debug
ede4f8a
@Luigi96
Add container registry option to all distros
2e01b35
@Luigi96
Fix container registry for debian Dockerfile
6922459
@Luigi96
Fix bug when container registry wasn't set
b3b5004
@Luigi96
Fix missing semicolons
a3ba961
@Luigi96
Fix issue to send container registry when testing
6a85e4e
@Luigi96 Luigi96 changed the title User defined image Specify a custom container registry Aug 2, 2024
jmjaffe37
jmjaffe37 approved these changes Aug 2, 2024
View reviewed changes
Copy link
Contributor

@jmjaffe37 jmjaffe37 left a comment

Choose a reason for hiding this comment

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

These are the same changes that we reviewed and used for our July PSU release. This worked well for us already, so I am happy that the time has come to upstream

karianna
karianna requested changes Aug 3, 2024
View reviewed changes
Copy link
Contributor

@karianna karianna left a comment

Choose a reason for hiding this comment

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

Most of my comments can be repeated for subsequent files, let's resolve the initial set and then we can apply to the rest.

linux/build.gradle Outdated Show resolved Hide resolved
linux/build.gradle Show resolved Hide resolved
linux/ca-certificates/debian/build.gradle Show resolved Hide resolved
linux/ca-certificates/debian/src/main/packaging/Dockerfile Show resolved Hide resolved
.../ca-certificates/debian/src/packageTest/java/org/adoptium/cacertificates/DebianFlavours.java Outdated Show resolved Hide resolved
.../ca-certificates/debian/src/packageTest/java/org/adoptium/cacertificates/DebianFlavours.java Outdated Show resolved Hide resolved
linux/jdk/redhat/src/packageTest/java/packaging/RedHatFlavoursWithDnf.java Outdated Show resolved Hide resolved
linux/jdk/redhat/src/main/packaging/Dockerfile Show resolved Hide resolved
linux/jdk/redhat/src/packageTest/java/packaging/RedHatFlavoursWithYum.java Outdated Show resolved Hide resolved
@karianna karianna requested a review from gdams August 15, 2024 02:30
@karianna
Copy link
Contributor

@gdams for a final review

@gdams gdams merged commit 38b2d02 into adoptium:master Aug 26, 2024
57 checks passed
@Luigi96 Luigi96 deleted the user-defined-image branch August 26, 2024 21:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@karianna karianna karianna approved these changes

@gdams gdams gdams approved these changes

@jmjaffe37 jmjaffe37 jmjaffe37 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Luigi96 @karianna @gdams @jmjaffe37