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
[docker] support metadata labels #965
Conversation
🙏 Is there anything else to get this merged? Thanks |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We need to resolve the merge conflict :(
Also, just to reiterate, the BUILD_DATE will not be set unless we move Linux image building/publishing to our own infra from Dockerhub builds. |
…bels * upstream/master: (69 commits) Use JDK 8u272 Alpine image Update find command to filter out windows Dockerfiles ignore SC2086 as in previous usage removing quotes around CURL_OPTIONS Update Plugin CLI Add --list option Comment out non-ported tests Rename test file Fix JENKINS_VERSION Rename test files and fix default Jenkins version Fixes check for variant Revert to use stretch for default Fix publishing to use new directory strucutre Update Jenkinsfile to build on ci.j.io, remove install-plugins tests since plugin-installation-manager-tool is being used now. Allow overriding the windowsservercore version Remove install-plugins script as it is not used. Small cleanup Passing all tests with JDK 8 Small updates Lots of tests passing ...
This commit could be potentially reverted if the docker images are generated using the Jenkins Infra environment
I just merged and fixed the conflicts. In addition, I removed the BUILD_DATE db75ddc |
…t: 'org.label-schema.version' See example of escaping double quotes moby/moby#27592
I think the failed tests are related to #1014 |
Is there anything else missing? |
Looks like there are some conflicts that need to be resolved |
…bels * upstream/master: (35 commits) @slide reminds me that there were other tests with the same reference Stop downloading from incrementals repo in test Only build hotspot jdk11 windowsserver core image Update tests to pass on new version Disable prune when using parallel in the same worker Update plugin manager to 2.1.2 chore: attempt to fix the 'Publish Experimental' phase Allow parallel testing chore: displaying dockerfile before building Fix tests on Windows Schedule only when building master branch Run docker system-prune always [CI] Fix powershell call Fix powershell with missing script argument Revert "chore: for testing purposes" JUnit step remove debug traces chore: add debug traces Use PassThru flag to know the number of test failures Update plugin manager ...
Just waiting on Oleg, he had requested changes. |
@oleg-nenashev are you ok with this? |
The file was removed in master, so removing in the PR to close out Merge Conflicts.
One test failing on the windows side right now. |
Looks like opencontainers is the replacement: https://github.com/opencontainers/image-spec/blob/master/annotations.md |
@slide any chance you can check the windows failure? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Lol the failure was do dumb, a new image was added and it just needed adding to.
🤕
It uses the metadata labels format explained in https://github.com/opencontainers/image-spec/blob/master/annotations.md?rgh-link-date=2021-07-08T07%3A26%3A24Z