Skip to content

Commit

Permalink
Merge pull request #344 from Miciah/art-consistency-openshift-4.12-os…
Browse files Browse the repository at this point in the history
…e-cluster-dns-operator

Updating ose-cluster-dns-operator images to be consistent with ART, and generate bindata
  • Loading branch information
openshift-merge-robot committed Oct 21, 2022
2 parents f18b783 + b3b7447 commit 1c136fe
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .ci-operator.yaml
@@ -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.19-openshift-4.12
4 changes: 2 additions & 2 deletions Dockerfile
@@ -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.19-openshift-4.12 AS builder
WORKDIR /dns-operator
COPY . .
RUN make build

FROM registry.ci.openshift.org/ocp/4.11:base
FROM registry.ci.openshift.org/ocp/4.12:base
COPY --from=builder /dns-operator/dns-operator /usr/bin/
COPY manifests /manifests
RUN useradd dns-operator
Expand Down
12 changes: 7 additions & 5 deletions pkg/manifests/bindata.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 1c136fe

Please sign in to comment.