-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Provide Docker Image for multiple Architectures (#1324)
- Update readme files to mention multi-arch images more prominently - Implement new check in the LowkeyVaultContainer to recommend multi-arch images when it could be beneficial - Add new tests Updates #1270 {minor} Signed-off-by: Esta Nagy <nagyesta@gmail.com>
- Loading branch information
Showing
7 changed files
with
116 additions
and
15 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
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
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
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
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
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
55 changes: 55 additions & 0 deletions
55
...rc/test/java/com/github/nagyesta/lowkeyvault/testcontainers/LowkeyVaultContainerTest.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,55 @@ | ||
| package com.github.nagyesta.lowkeyvault.testcontainers; | ||
|
|
||
| import org.junit.jupiter.params.ParameterizedTest; | ||
| import org.junit.jupiter.params.provider.Arguments; | ||
| import org.junit.jupiter.params.provider.MethodSource; | ||
| import org.slf4j.Logger; | ||
| import org.testcontainers.shaded.org.apache.commons.lang3.StringUtils; | ||
| import org.testcontainers.utility.DockerImageName; | ||
|
|
||
| import java.util.stream.Stream; | ||
|
|
||
| import static org.mockito.Mockito.*; | ||
|
|
||
| class LowkeyVaultContainerTest extends AbstractLowkeyVaultContainerTest { | ||
|
|
||
| public static Stream<Arguments> imageRecommendationInputProvider() { | ||
| return Stream.<Arguments>builder() | ||
| .add(Arguments.of("nagyesta/lowkey-vault:2.7.1", "amd64", false)) | ||
| .add(Arguments.of("nagyesta/lowkey-vault:2.7.1", "arm64", true)) | ||
| .add(Arguments.of("nagyesta/lowkey-vault:2.7.1-ubi9-minimal", "amd64", false)) | ||
| .add(Arguments.of("lowkey-vault:2.7.1", "amd64", false)) | ||
| .add(Arguments.of("lowkey-vault:2.7.1", "arm64", false)) | ||
| .build(); | ||
| } | ||
|
|
||
| @ParameterizedTest | ||
| @MethodSource("imageRecommendationInputProvider") | ||
| void testRecommendMultiArchImageIfApplicableShouldPrintRecommendationWhenHostIsNotMatchingImageArch( | ||
| final String imageName, final String hostArch, final boolean logExpected | ||
| ) { | ||
| //given | ||
| final DockerImageName dockerImageName = DockerImageName.parse(imageName) | ||
| .asCompatibleSubstituteFor(LowkeyVaultContainer.DEFAULT_IMAGE_NAME); | ||
| final LowkeyVaultContainer underTest = spy(LowkeyVaultContainerBuilder | ||
| .lowkeyVault(LowkeyVaultContainer.DEFAULT_IMAGE_NAME.withTag("2.7.1")) | ||
| .build()) | ||
| .withImagePullPolicy(shouldPull -> false); | ||
| final Logger loggerMock = mock(Logger.class); | ||
|
|
||
| //when | ||
| underTest.recommendMultiArchImageIfApplicable(loggerMock, dockerImageName, hostArch); | ||
|
|
||
| //then | ||
| if (logExpected) { | ||
| verify(loggerMock).warn( | ||
| eq("An amd64 image is detected with non-amd64 ({}) host."), eq(hostArch)); | ||
| verify(loggerMock).warn( | ||
| eq("Please consider using a multi-arch image, like: {}-ubi9-minimal"), | ||
| eq(StringUtils.substringAfterLast(imageName, ":"))); | ||
| verify(loggerMock).warn( | ||
| eq("See more information: https://github.com/nagyesta/lowkey-vault/tree/main/lowkey-vault-docker#arm-builds")); | ||
| } | ||
| verifyNoMoreInteractions(loggerMock); | ||
| } | ||
| } |