Skip to content

Commit

Permalink
UPSTREAM: <carry>: Update Dockerfile images to match ART
Browse files Browse the repository at this point in the history
(cherry picked from commit d821355)
(cherry picked from commit 8eaf9ca)
(cherry picked from commit 6548638)
(cherry picked from commit e77d513)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit 21ae45b)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit f4e855d)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit 212b84e)
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
(cherry picked from commit 10c686d)
Signed-off-by: Mat Kowalski <mko@redhat.com>
  • Loading branch information
AOS Automation Release Team authored and mkowalski committed Jun 21, 2023
1 parent b618206 commit f24a70e
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .ci-operator.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
build_root_image:
name: release
namespace: openshift
tag: rhel-8-release-golang-1.18-openshift-4.11
tag: rhel-8-release-golang-1.18-openshift-4.12
4 changes: 2 additions & 2 deletions build/Dockerfile.openshift
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11 AS builder
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12 AS builder
WORKDIR /go/src/github.com/openshift/kubernetes-nmstate
COPY . .
RUN GO111MODULE=on go build --mod=vendor -o build/_output/bin/manager ./cmd/handler/

FROM registry.ci.openshift.org/ocp/4.11:base
FROM registry.ci.openshift.org/ocp/4.12:base

RUN \
dnf -y update && \
Expand Down
4 changes: 2 additions & 2 deletions build/Dockerfile.operator.openshift
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11 AS builder
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12 AS builder
WORKDIR /go/src/github.com/openshift/kubernetes-nmstate
COPY . .
RUN GO111MODULE=on go build --mod=vendor -o build/_output/bin/manager ./cmd/operator

FROM registry.ci.openshift.org/ocp/4.11:base
FROM registry.ci.openshift.org/ocp/4.12:base

COPY --from=builder /go/src/github.com/openshift/kubernetes-nmstate/build/_output/bin/manager /usr/bin/
COPY deploy/crds/nmstate.io_nodenetwork*.yaml /bindata/kubernetes-nmstate/crds/
Expand Down

0 comments on commit f24a70e

Please sign in to comment.