diff --git a/test/images/README.md b/test/images/README.md index 936d63580a4..d0e01b92dcb 100644 --- a/test/images/README.md +++ b/test/images/README.md @@ -198,3 +198,9 @@ After all the above has been done, run the desired tests. ```bash sudo chmod o+x /etc/docker ``` + +A few images have been mirrored from dockerhub into the `gcr.io/k8s-staging-e2e-test-images` registry +(`busybox`, `glusterdynamic-provisioner`, `httpd`, `httpd-new`, `nginx`, `nginx-new`, `perl`), and they +only have a noop Dockerfile. However, due to an [issue](https://github.com/kubernetes/test-infra/issues/20884), +the same SHA cannot be pushed twice. A small change to them is required in order to generate a new SHA, +which can then be pushed and promoted. diff --git a/test/images/busybox/Dockerfile b/test/images/busybox/Dockerfile index 09a6978c0b5..da8f4f2c496 100644 --- a/test/images/busybox/Dockerfile +++ b/test/images/busybox/Dockerfile @@ -15,3 +15,5 @@ # NOTE(claudiub): Noop. We're just mirroring the image to staging. ARG BASEIMAGE FROM $BASEIMAGE + +LABEL image_version="1.29" diff --git a/test/images/busybox/Dockerfile_windows b/test/images/busybox/Dockerfile_windows index 0915c984ec0..0c600a74fae 100644 --- a/test/images/busybox/Dockerfile_windows +++ b/test/images/busybox/Dockerfile_windows @@ -86,4 +86,5 @@ ENV PATH="C:\dig\;C:\bin;C:\curl;C:\Windows\System32;C:\Windows;C:\Program Files # Persist %PSCORE% ENV variable for user convenience PSCORE="C:\Program Files\PowerShell\pwsh.exe" +LABEL image_version="1.29" ENTRYPOINT ["cmd.exe", "/s", "/c"] diff --git a/test/images/glusterdynamic-provisioner/Dockerfile b/test/images/glusterdynamic-provisioner/Dockerfile index 3983b7c4f24..d44092ad096 100644 --- a/test/images/glusterdynamic-provisioner/Dockerfile +++ b/test/images/glusterdynamic-provisioner/Dockerfile @@ -15,3 +15,5 @@ # NOTE(claudiub): Noop. We're just mirroring the image to staging. ARG BASEIMAGE FROM $BASEIMAGE + +LABEL image_version="v1.0" diff --git a/test/images/httpd-new/Dockerfile_windows b/test/images/httpd-new/Dockerfile_windows index 57d35bf8673..8f1a46d1d34 100644 --- a/test/images/httpd-new/Dockerfile_windows +++ b/test/images/httpd-new/Dockerfile_windows @@ -43,4 +43,5 @@ ENV PATH="C:\dig;C:\bin;C:\curl;C:\Windows\System32;C:\Windows;C:\Program Files\ USER ContainerAdministrator EXPOSE 80 +LABEL image_version="2.4.39-1" ENTRYPOINT ["C:/usr/local/apache2/bin/httpd.exe"] diff --git a/test/images/httpd/Dockerfile b/test/images/httpd/Dockerfile index 09a6978c0b5..2ab6032ce42 100644 --- a/test/images/httpd/Dockerfile +++ b/test/images/httpd/Dockerfile @@ -15,3 +15,5 @@ # NOTE(claudiub): Noop. We're just mirroring the image to staging. ARG BASEIMAGE FROM $BASEIMAGE + +LABEL image_version="2.4.38-1" diff --git a/test/images/httpd/Dockerfile_windows b/test/images/httpd/Dockerfile_windows index b7ebb8d9bd3..f973cb8bf89 100644 --- a/test/images/httpd/Dockerfile_windows +++ b/test/images/httpd/Dockerfile_windows @@ -43,4 +43,5 @@ ENV PATH="C:\dig;C:\bin;C:\curl;C:\Windows\System32;C:\Windows;C:\Program Files\ USER ContainerAdministrator EXPOSE 80 +LABEL image_version="2.4.39-1" ENTRYPOINT ["C:/usr/local/apache2/bin/httpd.exe"] diff --git a/test/images/nginx-new/Dockerfile b/test/images/nginx-new/Dockerfile index 3983b7c4f24..b5dac6276db 100644 --- a/test/images/nginx-new/Dockerfile +++ b/test/images/nginx-new/Dockerfile @@ -15,3 +15,5 @@ # NOTE(claudiub): Noop. We're just mirroring the image to staging. ARG BASEIMAGE FROM $BASEIMAGE + +LABEL image_version="1.15-1" diff --git a/test/images/nginx-new/Dockerfile_windows b/test/images/nginx-new/Dockerfile_windows index 0ba3744716c..c0d48ac98aa 100644 --- a/test/images/nginx-new/Dockerfile_windows +++ b/test/images/nginx-new/Dockerfile_windows @@ -24,4 +24,5 @@ COPY --from=nginx-source /nginx /usr/share/nginx USER ContainerAdministrator EXPOSE 80 +LABEL image_version="1.15-1" ENTRYPOINT ["/bin/sh", "-c", " cd /usr/share/nginx && ./nginx.exe"] diff --git a/test/images/nginx/Dockerfile b/test/images/nginx/Dockerfile index 3983b7c4f24..9a0c8ffb425 100644 --- a/test/images/nginx/Dockerfile +++ b/test/images/nginx/Dockerfile @@ -15,3 +15,5 @@ # NOTE(claudiub): Noop. We're just mirroring the image to staging. ARG BASEIMAGE FROM $BASEIMAGE + +LABEL image_version="1.14-1" diff --git a/test/images/nginx/Dockerfile_windows b/test/images/nginx/Dockerfile_windows index 426df1e2569..8f65e28bc06 100644 --- a/test/images/nginx/Dockerfile_windows +++ b/test/images/nginx/Dockerfile_windows @@ -24,4 +24,5 @@ COPY --from=nginx-source /nginx /usr/share/nginx USER ContainerAdministrator EXPOSE 80 +LABEL image_version="1.14-1" ENTRYPOINT ["/bin/sh", "-c", " cd /usr/share/nginx && ./nginx.exe"] diff --git a/test/images/perl/Dockerfile b/test/images/perl/Dockerfile index 3983b7c4f24..b87e4ec722d 100644 --- a/test/images/perl/Dockerfile +++ b/test/images/perl/Dockerfile @@ -15,3 +15,5 @@ # NOTE(claudiub): Noop. We're just mirroring the image to staging. ARG BASEIMAGE FROM $BASEIMAGE + +LABEL image_version="5.26"