Skip to content

Commit aa1805e

Browse files
authored
Merge pull request #16 from deads2k/prime-bootstrapmanifests
create bootstrap-manifests directory
2 parents 82df272 + fbf5181 commit aa1805e

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ ENV GO_PACKAGE github.com/openshift/cluster-config-operator
55
RUN go build -ldflags "-X $GO_PACKAGE/pkg/version.versionFromGit=$(git describe --long --tags --abbrev=7 --match 'v[0-9]*')" ./cmd/cluster-config-operator
66

77
FROM registry.svc.ci.openshift.org/openshift/origin-v4.0:base
8-
RUN mkdir -p /usr/share/bootkube/manifests
9-
COPY --from=builder /go/src/github.com/openshift/cluster-config-operator/manifests/* /usr/share/bootkube/manifests/
8+
RUN mkdir -p /usr/share/bootkube/manifests/manifests
9+
RUN mkdir -p /usr/share/bootkube/manifests/bootstrap-manifests
10+
COPY --from=builder /go/src/github.com/openshift/cluster-config-operator/manifests/* /usr/share/bootkube/manifests/manifests/
1011
COPY --from=builder /go/src/github.com/openshift/cluster-config-operator/cluster-config-operator /usr/bin/
1112
COPY manifests /manifests
1213
LABEL io.openshift.release.operator true

Dockerfile.rhel7

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ ENV GO_PACKAGE github.com/openshift/cluster-config-operator
55
RUN go build -ldflags "-X $GO_PACKAGE/pkg/version.versionFromGit=$(git describe --long --tags --abbrev=7 --match 'v[0-9]*')" ./cmd/cluster-config-operator
66

77
FROM registry.svc.ci.openshift.org/ocp/4.0:base
8-
RUN mkdir -p /usr/share/bootkube/manifests
9-
COPY --from=builder /go/src/github.com/openshift/cluster-config-operator/manifests/* /usr/share/bootkube/manifests/
8+
RUN mkdir -p /usr/share/bootkube/manifests/manifests
9+
RUN mkdir -p /usr/share/bootkube/manifests/bootstrap-manifests
10+
COPY --from=builder /go/src/github.com/openshift/cluster-config-operator/manifests/* /usr/share/bootkube/manifests/manifests/
1011
COPY --from=builder /go/src/github.com/openshift/cluster-config-operator/cluster-config-operator /usr/bin/
1112
COPY manifests /manifests
1213
LABEL io.openshift.release.operator true

0 commit comments

Comments
 (0)