-
Notifications
You must be signed in to change notification settings - Fork 1.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: allow pushing images with different arch/os to docker daemon (#4268
- Loading branch information
Showing
4 changed files
with
178 additions
and
88 deletions.
There are no files selected for viewing
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
109 changes: 109 additions & 0 deletions
109
...integration-test/java/com/google/cloud/tools/jib/api/JibMultiPlatformIntegrationTest.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,109 @@ | ||
| /* | ||
| * Copyright 2024 Google LLC. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); you may not | ||
| * use this file except in compliance with the License. You may obtain a copy of | ||
| * the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | ||
| * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | ||
| * License for the specific language governing permissions and limitations under | ||
| * the License. | ||
| */ | ||
|
|
||
| package com.google.cloud.tools.jib.api; | ||
|
|
||
| import static com.google.common.truth.Truth.assertThat; | ||
|
|
||
| import com.google.cloud.tools.jib.Command; | ||
| import com.google.cloud.tools.jib.api.buildplan.Platform; | ||
| import com.google.cloud.tools.jib.registry.LocalRegistry; | ||
| import com.google.common.collect.ImmutableSet; | ||
| import java.io.IOException; | ||
| import java.util.concurrent.ExecutionException; | ||
| import org.junit.After; | ||
| import org.junit.Assert; | ||
| import org.junit.ClassRule; | ||
| import org.junit.Test; | ||
|
|
||
| public class JibMultiPlatformIntegrationTest { | ||
|
|
||
| @ClassRule public static final LocalRegistry localRegistry = new LocalRegistry(5000); | ||
|
|
||
| private final String dockerHost = | ||
| System.getenv("DOCKER_IP") != null ? System.getenv("DOCKER_IP") : "localhost"; | ||
| private String imageToDelete; | ||
|
|
||
| @After | ||
| public void tearDown() throws IOException, InterruptedException { | ||
| System.clearProperty("sendCredentialsOverHttp"); | ||
| if (imageToDelete != null) { | ||
| new Command("docker", "rmi", imageToDelete).run(); | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| public void testBasic_jibImageToDockerDaemon_arm64() | ||
| throws IOException, InterruptedException, InvalidImageReferenceException, ExecutionException, | ||
| RegistryException, CacheDirectoryCreationException { | ||
| // Use arm64v8/busybox as base image. | ||
| String toImage = dockerHost + ":5000/docker-daemon-mismatched-arch"; | ||
| Jib.from( | ||
| RegistryImage.named( | ||
| "busybox@sha256:eb427d855f82782c110b48b9a398556c629ce4951ae252c6f6751a136e194668")) | ||
| .containerize(Containerizer.to(DockerDaemonImage.named(toImage))); | ||
| String os = | ||
| new Command("docker", "inspect", toImage, "--format", "{{.Os}}").run().replace("\n", ""); | ||
| String architecture = | ||
| new Command("docker", "inspect", toImage, "--format", "{{.Architecture}}") | ||
| .run() | ||
| .replace("\n", ""); | ||
| assertThat(os).isEqualTo("linux"); | ||
| assertThat(architecture).isEqualTo("arm64"); | ||
| imageToDelete = toImage; | ||
| } | ||
|
|
||
| @Test | ||
| public void testBasicMultiPlatform_toDockerDaemon_pickFirstPlatformWhenNoMatchingImage() | ||
| throws IOException, InterruptedException, InvalidImageReferenceException, | ||
| CacheDirectoryCreationException, ExecutionException, RegistryException { | ||
| String toImage = dockerHost + ":5000/docker-daemon-multi-plat-mismatched-configs"; | ||
| Jib.from( | ||
| RegistryImage.named( | ||
| "busybox@sha256:4f47c01fa91355af2865ac10fef5bf6ec9c7f42ad2321377c21e844427972977")) | ||
| .setPlatforms(ImmutableSet.of(new Platform("s390x", "linux"), new Platform("arm", "linux"))) | ||
| .containerize( | ||
| Containerizer.to(DockerDaemonImage.named(toImage)).setAllowInsecureRegistries(true)); | ||
| String os = | ||
| new Command("docker", "inspect", toImage, "--format", "{{.Os}}").run().replace("\n", ""); | ||
| String architecture = | ||
| new Command("docker", "inspect", toImage, "--format", "{{.Architecture}}") | ||
| .run() | ||
| .replace("\n", ""); | ||
| assertThat(os).isEqualTo("linux"); | ||
| assertThat(architecture).isEqualTo("s390x"); | ||
| imageToDelete = toImage; | ||
| } | ||
|
|
||
| @Test | ||
| public void testBasicMultiPlatform_toDockerDaemon() | ||
| throws IOException, InterruptedException, ExecutionException, RegistryException, | ||
| CacheDirectoryCreationException, InvalidImageReferenceException { | ||
| String toImage = dockerHost + ":5000/docker-daemon-multi-platform"; | ||
| Jib.from( | ||
| RegistryImage.named( | ||
| "busybox@sha256:4f47c01fa91355af2865ac10fef5bf6ec9c7f42ad2321377c21e844427972977")) | ||
| .setPlatforms( | ||
| ImmutableSet.of(new Platform("arm64", "linux"), new Platform("amd64", "linux"))) | ||
| .setEntrypoint("echo", "Hello World") | ||
| .containerize( | ||
| Containerizer.to(DockerDaemonImage.named(toImage)).setAllowInsecureRegistries(true)); | ||
|
|
||
| String output = new Command("docker", "run", "--rm", toImage).run(); | ||
| Assert.assertEquals("Hello World\n", output); | ||
| imageToDelete = toImage; | ||
| } | ||
| } |
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
Oops, something went wrong.