Check configured platforms for single image building #2793
Merged
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
chanseokoh
commented
Oct 1, 2020
| @@ -111,6 +111,8 @@ static boolean isGzipped(Path path) throws IOException { | |||
| Optional<LocalImage> cachedImage = | |||
| getCachedDockerImage(buildContext.getBaseImageLayersCache(), dockerImageDetails); | |||
| if (cachedImage.isPresent()) { | |||
| PlatformChecker.checkManifestPlatform( | |||
| buildContext, cachedImage.get().configurationTemplate); | |||
There was a problem hiding this comment.
This is when a local docker:// base image is cached.
| progressEventDispatcher.newChildProducer(), | ||
| tempDirectoryProvider); | ||
| PlatformChecker.checkManifestPlatform(buildContext, localImage.configurationTemplate); | ||
| return localImage; |
There was a problem hiding this comment.
When using a local docker:// image that has not been cached.
| cacheDockerImageTar( | ||
| buildContext, tarPath, progressEventDispatcherFactory, tempDirectoryProvider); | ||
| PlatformChecker.checkManifestPlatform(buildContext, localImage.configurationTemplate); | ||
| return localImage; |
There was a problem hiding this comment.
When tar:// (covers both cached and fresh cases).
| @@ -233,6 +233,7 @@ public ImagesAndRegistryClient call() | |||
| BuildableManifestTemplate imageManifest = (BuildableManifestTemplate) manifestTemplate; | |||
| ContainerConfigurationTemplate containerConfig = | |||
| pullContainerConfigJson(manifestAndDigest, registryClient, progressEventDispatcher); | |||
| PlatformChecker.checkManifestPlatform(buildContext, containerConfig); | |||
There was a problem hiding this comment.
When pulling a remote manifest (not cached).
|
|
||
| ContainerConfigurationTemplate containerConfig = | ||
| Verify.verifyNotNull(manifestsAndConfigs.get(0).getConfig()); | ||
| PlatformChecker.checkManifestPlatform(buildContext, containerConfig); |
There was a problem hiding this comment.
When using a cached manifest for a remote base image.
|
Ready for review. |
mpeddada1
reviewed
Oct 1, 2020
jib-core/src/main/java/com/google/cloud/tools/jib/builder/steps/PlatformChecker.java
Show resolved
Hide resolved
mpeddada1
reviewed
Oct 1, 2020
jib-core/src/main/java/com/google/cloud/tools/jib/builder/steps/PlatformChecker.java
Show resolved
Hide resolved
mpeddada1
approved these changes
Oct 5, 2020
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.
Fixes #2746. Fixes #2745.
When the base image is not a manifest list (including a local Docker and tar image), logs a warning in the follow cases.
amd64/linux.About 2): Currently we cannot distinguish between explicitly configured
amd64/linuxand the implicitamd64/linuxdefault when omitted, so unfortunately sometimes we need to suppress logging even if the platforms don't match.