From 94c9fbb3d55bf8ba3d750cba1a49ba869b63407c Mon Sep 17 00:00:00 2001 From: Pierre Prinetti Date: Sun, 30 Jan 2022 07:26:14 +0100 Subject: [PATCH] Updating images to be consistent with ART --- .ci-operator.yaml | 2 +- Dockerfile | 10 +--------- Dockerfile.rhel | 4 ++-- 3 files changed, 4 insertions(+), 12 deletions(-) mode change 100644 => 120000 Dockerfile diff --git a/.ci-operator.yaml b/.ci-operator.yaml index 00d7adfcf4..46d8010b67 100644 --- a/.ci-operator.yaml +++ b/.ci-operator.yaml @@ -1,4 +1,4 @@ build_root_image: name: release namespace: openshift - tag: rhel-8-release-golang-1.17-openshift-4.10 + tag: rhel-8-release-golang-1.17-openshift-4.11 diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index e59a7e9209..0000000000 --- a/Dockerfile +++ /dev/null @@ -1,9 +0,0 @@ -FROM registry.ci.openshift.org/openshift/release:golang-1.17 AS builder -WORKDIR /go/src/sigs.k8s.io/cluster-api-provider-openstack -COPY . . - -RUN go build -o ./machine-controller-manager ./cmd/manager - -FROM registry.ci.openshift.org/openshift/origin-v4.0:base - -COPY --from=builder /go/src/sigs.k8s.io/cluster-api-provider-openstack/machine-controller-manager / diff --git a/Dockerfile b/Dockerfile new file mode 120000 index 0000000000..46cd531f60 --- /dev/null +++ b/Dockerfile @@ -0,0 +1 @@ +Dockerfile.rhel \ No newline at end of file diff --git a/Dockerfile.rhel b/Dockerfile.rhel index 6710d3cdab..6cabfd13f2 100644 --- a/Dockerfile.rhel +++ b/Dockerfile.rhel @@ -1,9 +1,9 @@ -FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.10 AS builder +FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.11 AS builder WORKDIR /go/src/sigs.k8s.io/cluster-api-provider-openstack COPY . . RUN go build -o ./machine-controller-manager ./cmd/manager -FROM registry.ci.openshift.org/ocp/4.10:base +FROM registry.ci.openshift.org/ocp/4.11:base COPY --from=builder /go/src/sigs.k8s.io/cluster-api-provider-openstack/machine-controller-manager /