File tree Expand file tree Collapse file tree 2 files changed +25
-2
lines changed
main/java/com/iexec/worker/docker
test/java/com/iexec/worker/docker Expand file tree Collapse file tree 2 files changed +25
-2
lines changed Original file line number Diff line number Diff line change @@ -408,7 +408,7 @@ DockerClient getClient() {
408408 * @param imageName
409409 * @return imageName without registry url
410410 */
411- private String normalizeImageName (String imageName ) {
411+ public String normalizeImageName (String imageName ) {
412412 // TODO: check image tag here.
413413 if (StringUtils .isEmpty (imageName )) {
414414 return "" ;
Original file line number Diff line number Diff line change 4040
4141import static com .iexec .worker .docker .DockerClientService .WORKER_DOCKER_NETWORK ;
4242import static org .assertj .core .api .Assertions .assertThat ;
43- import static org .mockito .ArgumentMatchers .any ;
4443import static org .mockito .Mockito .*;
4544
4645
@@ -628,6 +627,30 @@ public void shouldNotRemoveContainerSinceDockerCmdException() {
628627 assertThat (dockerClientService .removeContainer (getRandomString ())).isFalse ();
629628 }
630629
630+ @ Test
631+ public void shouldRemoveRegistryUrlFromImageName () {
632+ assertThat (
633+ dockerClientService
634+ .normalizeImageName ("registry/namespace/image:tag" )
635+ ).isEqualTo ("namespace/image:tag" );
636+ }
637+
638+ @ Test
639+ public void shouldAcceptImageNameWithoutRegistryUrl () {
640+ assertThat (
641+ dockerClientService
642+ .normalizeImageName ("namespace/image:tag" )
643+ ).isEqualTo ("namespace/image:tag" );
644+ }
645+
646+ @ Test
647+ public void ShouldAcceptOfficialImageName () {
648+ assertThat (
649+ dockerClientService
650+ .normalizeImageName ("official:tag" )
651+ ).isEqualTo ("official:tag" );
652+ }
653+
631654 private String getRandomString () {
632655 return RandomStringUtils .randomAlphanumeric (20 );
633656 }
You can’t perform that action at this time.
0 commit comments