Skip to content

Commit 05e5f34

Browse files
committed
UPSTREAM: <carry>: Remove build of test image registry
Upstream now uses a different image Signed-off-by: Todd Short <todd.short@me.com>
1 parent 767e2a4 commit 05e5f34

File tree

2 files changed

+1
-7
lines changed

2 files changed

+1
-7
lines changed

openshift/operator-controller/build-test-registry.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,8 @@ spec:
5151
spec:
5252
containers:
5353
- name: registry
54-
image: ${image}
54+
image: registry:3
5555
imagePullPolicy: IfNotPresent
56-
command:
57-
- /registry
58-
args:
59-
- "--registry-address=:5000"
6056
volumeMounts:
6157
- mountPath: /var/certs
6258
name: operator-controller-e2e-certs

openshift/registry.Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,10 @@ WORKDIR /build
33
COPY . .
44
# TODO Modify upstream Makefile to separate the 'go build' commands
55
# from 'image-registry' target so we don't need these
6-
RUN go build -o ./registry ./testdata/registry/registry.go
76
RUN go build -o ./push ./testdata/push/push.go
87

98
FROM registry.ci.openshift.org/ocp/4.20:base-rhel9
109
USER 1001
11-
COPY --from=builder /build/registry /registry
1210
COPY --from=builder /build/push /push
1311
COPY openshift/operator-controller/manifests /openshift/manifests
1412
COPY testdata/images /images

0 commit comments

Comments
 (0)