Skip to content

Commit ac4e1a8

Browse files
committed
chore: update fixtures to use full container registry address
On OpenShift, these images were defaulting to a container registry that was not Docker Hub, causing some images to fail to pull.
1 parent 3c25a49 commit ac4e1a8

14 files changed

+48
-34
lines changed

test/fixtures/alpine-pod.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ spec:
1010
- name: docker-io
1111
containers:
1212
- name: alpine
13-
image: alpine
13+
image: docker.io/library/alpine:latest
1414
command: ['sh', '-c', 'echo Hello from alpine pod! && sleep 360000']

test/fixtures/binaries-deployment.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ spec:
1919
- name: docker-io
2020
containers:
2121
- name: node
22-
image: node@sha256:215a9fbef4df2c1ceb7c79481d3cfd94ad8f1f0105bade39f3be907bf386c5e1
22+
image: docker.io/library/node@sha256:215a9fbef4df2c1ceb7c79481d3cfd94ad8f1f0105bade39f3be907bf386c5e1
2323
command: ['sh', '-c', 'echo Hello from node:lts-alpine3.11 pod! && sleep 360000']
2424
ports:
2525
- containerPort: 80
2626
- name: openjdk
27-
image: openjdk:14.0.1
28-
command: ['sh', '-c', 'echo Hello from openjdk:14 pod! && sleep 360000']
27+
image: docker.io/library/openjdk:14.0.1
28+
command: ['sh', '-c', 'echo Hello from openjdk:14 pod! && sleep 360000']

test/fixtures/centos-deployment.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,11 @@ spec:
1717
imagePullSecrets:
1818
- name: docker-io
1919
containers:
20-
- image: centos:7
20+
- image: docker.io/library/centos:7
2121
imagePullPolicy: Always
2222
name: centos
23+
command:
24+
- sleep
25+
args:
26+
- infinity
2327
securityContext: {}

test/fixtures/consul-deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ spec:
1818
imagePullSecrets:
1919
- name: docker-io
2020
containers:
21-
- image: snyk/runtime-fixtures:consul
21+
- image: docker.io/snyk/runtime-fixtures:consul
2222
imagePullPolicy: Always
2323
name: consul
2424
command: ['/bin/sleep']

test/fixtures/hello-world-deploymentconfig.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ spec:
1818
containers:
1919
- command:
2020
- /hello
21-
image: hello-world:latest
21+
image: docker.io/library/hello-world:latest
2222
imagePullPolicy: IfNotPresent
2323
name: main
2424
securityContext:

test/fixtures/insecure-registries/push-dockerhub-image-to-local-registry.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ spec:
99
- name: docker-io
1010
containers:
1111
- name: my-container
12-
image: golang:1.13.1-alpine3.10
12+
image: docker.io/library/golang:1.13.1-alpine3.10
1313
command:
1414
- "sh"
1515
args:
@@ -19,6 +19,6 @@ spec:
1919
cd $GOPATH/src/github.com/containers/skopeo &&
2020
make binary-local-static DISABLE_CGO=1 &&
2121
make install &&
22-
skopeo copy --dest-tls-verify=false docker://python:rc-buster docker://kind-registry:5000/python:rc-buster"
22+
skopeo copy --dest-tls-verify=false docker://docker.io/library/python:rc-buster docker://kind-registry:5000/python:rc-buster"
2323
restartPolicy: Never
2424
backoffLimit: 4

test/fixtures/java-deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ spec:
1818
imagePullSecrets:
1919
- name: docker-io
2020
containers:
21-
- image: java:latest
21+
- image: docker.io/library/java:latest
2222
imagePullPolicy: Always
2323
name: java
2424
command: ['/bin/sleep']

test/fixtures/nginx-replicationcontroller.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,8 @@ spec:
1717
- name: docker-io
1818
containers:
1919
- name: nginx
20-
image: nginx
20+
image: docker.io/library/nginx:latest
21+
command:
22+
- sleep
23+
args:
24+
- infinity

test/fixtures/oci-dummy-pod.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ spec:
1010
- name: docker-io
1111
containers:
1212
- name: oci-dummy
13-
image: snyk/runtime-fixtures:oci-dummy
13+
image: docker.io/snyk/runtime-fixtures:oci-dummy
1414
command: ['/app/sample']

test/fixtures/proxying/tinyproxy-deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ spec:
1616
- name: docker-io
1717
containers:
1818
- name: forwarding-proxy
19-
image: snyk/runtime-fixtures:tinyproxy
19+
image: docker.io/snyk/runtime-fixtures:tinyproxy
2020
resources:
2121
limits:
2222
memory: "128Mi"

0 commit comments

Comments
 (0)