Skip to content

Commit

Permalink
Bug 1915926: Update ose-openstack-machine-controllers builder & base …
Browse files Browse the repository at this point in the history
…images to be consistent with ART
  • Loading branch information
pierreprinetti committed Jan 13, 2021
1 parent 5f60693 commit 4f2c407
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
@@ -1,9 +1,9 @@
FROM registry.svc.ci.openshift.org/openshift/release:golang-1.13 AS builder
FROM registry.ci.openshift.org/openshift/release:golang-1.15 AS builder
WORKDIR /go/src/sigs.k8s.io/cluster-api-provider-openstack
COPY . .

RUN go build -o ./machine-controller-manager ./cmd/manager

FROM registry.svc.ci.openshift.org/openshift/origin-v4.0:base
FROM registry.svc.ci.openshift.org/openshift/origin-v4.7:base

COPY --from=builder /go/src/sigs.k8s.io/cluster-api-provider-openstack/machine-controller-manager /
2 changes: 1 addition & 1 deletion Dockerfile.rhel
@@ -1,4 +1,4 @@
FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.7 AS builder
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.7 AS builder
WORKDIR /go/src/sigs.k8s.io/cluster-api-provider-openstack
COPY . .

Expand Down

0 comments on commit 4f2c407

Please sign in to comment.