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

[docker] support metadata labels #965

Merged
merged 26 commits into from Aug 2, 2021
Merged

Conversation

v1v
Copy link
Member

@v1v v1v commented Jul 1, 2020

@v1v v1v marked this pull request as ready for review July 1, 2020 16:21
@v1v v1v requested a review from a team as a code owner July 1, 2020 16:21
Dockerfile Outdated Show resolved Hide resolved
@v1v
Copy link
Member Author

v1v commented Sep 16, 2020

🙏 Is there anything else to get this merged? Thanks

Makefile Outdated Show resolved Hide resolved
Copy link
Member

@oleg-nenashev oleg-nenashev left a 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 :(

@slide
Copy link
Member

slide commented Oct 15, 2020

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
@v1v
Copy link
Member Author

v1v commented Oct 28, 2020

I just merged and fixed the conflicts. In addition, I removed the BUILD_DATE db75ddc

tests/test_helpers.bash Outdated Show resolved Hide resolved
@v1v
Copy link
Member Author

v1v commented Nov 24, 2020

Is there anything else missing?

@slide
Copy link
Member

slide commented Nov 24, 2020

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
  ...
@timja
Copy link
Member

timja commented Dec 7, 2020

@slide?

@timja
Copy link
Member

timja commented Dec 7, 2020

/ @oleg-nenashev

@slide
Copy link
Member

slide commented Dec 7, 2020

Just waiting on Oleg, he had requested changes.

@garethjevans
Copy link
Contributor

@oleg-nenashev are you ok with this?

The file was removed in master, so removing in the PR to close out Merge Conflicts.
@slide
Copy link
Member

slide commented Feb 12, 2021

One test failing on the windows side right now.

@timja
Copy link
Member

timja commented Jul 8, 2021

Looks like opencontainers is the replacement: https://github.com/opencontainers/image-spec/blob/master/annotations.md

@timja timja dismissed oleg-nenashev’s stale review July 8, 2021 07:34

review is 9 months old

@timja timja enabled auto-merge (squash) July 8, 2021 07:35
@timja
Copy link
Member

timja commented Jul 9, 2021

@slide any chance you can check the windows failure?

Copy link
Member

@timja timja left a 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.

🤕

@timja timja disabled auto-merge August 2, 2021 11:07
@timja timja merged commit ab2fdfc into jenkinsci:master Aug 2, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants