Pre-pull images required for Docker Compose image builds - including authenticated pulls #2201
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
So that ImageFromDockerfile and Docker Compose can use images from authenticated registries when building temporary images Fixes #1799
bsideup
reviewed
Mar 24, 2020
bsideup
reviewed
Mar 24, 2020
| @@ -2,5 +2,3 @@ redis: | |||
| image: redis | |||
| mysql: | |||
| image: mysql | |||
| custom: | |||
There was a problem hiding this comment.
could you please clarify why it was removed? :)
There was a problem hiding this comment.
Hmm I think I was trying to make sure the tests only tested one thing (we have other test cases and other example compose files that cover the build scenario).
Still, I now think I'll restore it to how it was, to give us better coverage for v1 compose files.
kiview
approved these changes
Mar 24, 2020
bsideup
approved these changes
Apr 4, 2020
rnorth
changed the title
|
This was released in https://github.com/testcontainers/testcontainers-java/releases/tag/1.14.0 🎉 |
quincy
pushed a commit
to quincy/testcontainers-java
that referenced
this pull request
May 28, 2020
…tainers#2201) * Pre-pull images required for Dockerfile/Compose image builds So that ImageFromDockerfile and Docker Compose can use images from authenticated registries when building temporary images Fixes testcontainers#1799 * Restore wider test scope
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
So that ImageFromDockerfile and Docker Compose can use images from authenticated registries when building temporary images.
This PR again involves very light parsing; this time adding just enough parsing of Dockerfiles to ensure that images are pre-pulled, and also to discover such Dockerfiles when they're part of a compose build.
This completes our coverage for authenticated pulls - all of the following should now work:
GenericContainer(someAuthenticatedImage)ImageFromDockerfilethat includes one/moreFROM someAuthenticatedImagelines. EDIT: post release, I found a bug with this which will be fixed shortlydocker-compose.ymlfiles that point to an image viaimage: someAuthenticatedImagedocker-compose.ymlfiles that includebuild: someDockerfilewhere the dockerfile includes one/moreFROM someAuthenticatedImagelinesI think the parsing is simple enough, and solid enough, that it should work in all cases. However, it should also do no harm if there is ever an exotic new way to identify docker image names in Dockerfiles/compose files.
Fixes #1799