github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 04:33:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #99609 from claudiubelu/test-images/same-sha

Browse Source 
test images: Generates new SHAs for mirrored images
This commit is contained in:
Kubernetes Prow Robot 2021-03-01 17:13:33 -08:00 committed by GitHub
commit be2a2988a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/images/README.md
View File

@ -198,3 +198,9 @@ After all the above has been done, run the desired tests.
```bash ```bash
sudo chmod o+x /etc/docker 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.

2
test/images/busybox/Dockerfile
View File

@ -15,3 +15,5 @@
# NOTE(claudiub): Noop. We're just mirroring the image to staging. # NOTE(claudiub): Noop. We're just mirroring the image to staging.
ARG BASEIMAGE ARG BASEIMAGE
FROM $BASEIMAGE FROM $BASEIMAGE
LABEL image_version="1.29"

1
test/images/busybox/Dockerfile_windows
View File

@ -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 # Persist %PSCORE% ENV variable for user convenience
PSCORE="C:\Program Files\PowerShell\pwsh.exe" PSCORE="C:\Program Files\PowerShell\pwsh.exe"
LABEL image_version="1.29"
ENTRYPOINT ["cmd.exe", "/s", "/c"] ENTRYPOINT ["cmd.exe", "/s", "/c"]

2
test/images/glusterdynamic-provisioner/Dockerfile
View File

@ -15,3 +15,5 @@
# NOTE(claudiub): Noop. We're just mirroring the image to staging. # NOTE(claudiub): Noop. We're just mirroring the image to staging.
ARG BASEIMAGE ARG BASEIMAGE
FROM $BASEIMAGE FROM $BASEIMAGE
LABEL image_version="v1.0"

1
test/images/httpd-new/Dockerfile_windows
View File

@ -43,4 +43,5 @@ ENV PATH="C:\dig;C:\bin;C:\curl;C:\Windows\System32;C:\Windows;C:\Program Files\
USER ContainerAdministrator USER ContainerAdministrator
EXPOSE 80 EXPOSE 80
LABEL image_version="2.4.39-1"
ENTRYPOINT ["C:/usr/local/apache2/bin/httpd.exe"] ENTRYPOINT ["C:/usr/local/apache2/bin/httpd.exe"]

2
test/images/httpd/Dockerfile
View File

@ -15,3 +15,5 @@
# NOTE(claudiub): Noop. We're just mirroring the image to staging. # NOTE(claudiub): Noop. We're just mirroring the image to staging.
ARG BASEIMAGE ARG BASEIMAGE
FROM $BASEIMAGE FROM $BASEIMAGE
LABEL image_version="2.4.38-1"

1
test/images/httpd/Dockerfile_windows
View File

@ -43,4 +43,5 @@ ENV PATH="C:\dig;C:\bin;C:\curl;C:\Windows\System32;C:\Windows;C:\Program Files\
USER ContainerAdministrator USER ContainerAdministrator
EXPOSE 80 EXPOSE 80
LABEL image_version="2.4.39-1"
ENTRYPOINT ["C:/usr/local/apache2/bin/httpd.exe"] ENTRYPOINT ["C:/usr/local/apache2/bin/httpd.exe"]

2
test/images/nginx-new/Dockerfile
View File

@ -15,3 +15,5 @@
# NOTE(claudiub): Noop. We're just mirroring the image to staging. # NOTE(claudiub): Noop. We're just mirroring the image to staging.
ARG BASEIMAGE ARG BASEIMAGE
FROM $BASEIMAGE FROM $BASEIMAGE
LABEL image_version="1.15-1"

1
test/images/nginx-new/Dockerfile_windows
View File

@ -24,4 +24,5 @@ COPY --from=nginx-source /nginx /usr/share/nginx
USER ContainerAdministrator USER ContainerAdministrator
EXPOSE 80 EXPOSE 80
LABEL image_version="1.15-1"
ENTRYPOINT ["/bin/sh", "-c", " cd /usr/share/nginx && ./nginx.exe"] ENTRYPOINT ["/bin/sh", "-c", " cd /usr/share/nginx && ./nginx.exe"]

2
test/images/nginx/Dockerfile
View File

@ -15,3 +15,5 @@
# NOTE(claudiub): Noop. We're just mirroring the image to staging. # NOTE(claudiub): Noop. We're just mirroring the image to staging.
ARG BASEIMAGE ARG BASEIMAGE
FROM $BASEIMAGE FROM $BASEIMAGE
LABEL image_version="1.14-1"

1
test/images/nginx/Dockerfile_windows
View File

@ -24,4 +24,5 @@ COPY --from=nginx-source /nginx /usr/share/nginx
USER ContainerAdministrator USER ContainerAdministrator
EXPOSE 80 EXPOSE 80
LABEL image_version="1.14-1"
ENTRYPOINT ["/bin/sh", "-c", " cd /usr/share/nginx && ./nginx.exe"] ENTRYPOINT ["/bin/sh", "-c", " cd /usr/share/nginx && ./nginx.exe"]

2
test/images/perl/Dockerfile
View File

@ -15,3 +15,5 @@
# NOTE(claudiub): Noop. We're just mirroring the image to staging. # NOTE(claudiub): Noop. We're just mirroring the image to staging.
ARG BASEIMAGE ARG BASEIMAGE
FROM $BASEIMAGE FROM $BASEIMAGE
LABEL image_version="5.26"