Skip to content

Commit 9fe68bd

Browse files
committed
backport "use scos images for CI"
1 parent 8735154 commit 9fe68bd

File tree

3 files changed

+20
-3
lines changed

3 files changed

+20
-3
lines changed
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"default": [
3+
{
4+
"type": "insecureAcceptAnything"
5+
}
6+
],
7+
"transports":
8+
{
9+
"docker-daemon":
10+
{
11+
"": [{"type":"insecureAcceptAnything"}]
12+
}
13+
}
14+
}

templates/index.Dockerfile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM registry.ci.openshift.org/origin/__OCP_MAX_VERSION__:operator-registry AS opm
1+
FROM registry.ci.openshift.org/origin/scos-__OCP_MAX_VERSION__:operator-registry AS opm
22

33
FROM registry.access.redhat.com/ubi9/ubi-minimal as builder
44

@@ -7,13 +7,16 @@ COPY --from=opm /bin/opm /bin/opm
77
# Copy declarative config root into image at /configs
88
COPY olm-catalog/serverless-operator-index/configs /configs
99

10+
# Copy policy.json for opm
11+
COPY olm-catalog/serverless-operator-index/policy.json /etc/containers/policy.json
12+
1013
RUN /bin/opm init serverless-operator --default-channel=__DEFAULT_CHANNEL__ --output yaml >> /configs/index.yaml
1114
RUN /bin/opm render --skip-tls-verify -o yaml \
1215
__BUNDLE__ >> /configs/index.yaml
1316

1417
# The base image is expected to contain
1518
# /bin/opm (with a serve subcommand) and /bin/grpc_health_probe
16-
FROM registry.ci.openshift.org/origin/__OCP_MAX_VERSION__:operator-registry
19+
FROM registry.ci.openshift.org/origin/scos-__OCP_MAX_VERSION__:operator-registry
1720

1821
# Copy declarative config root into image at /configs
1922
COPY --from=builder /configs /configs

templates/test-source-image.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM registry.ci.openshift.org/ocp/__OCP_MAX_VERSION__:cli-artifacts AS oc-image
1+
FROM registry.ci.openshift.org/origin/scos-__OCP_MAX_VERSION__:cli-artifacts AS oc-image
22

33
FROM src
44

0 commit comments

Comments
 (0)