Skip to content

Commit

Permalink
Merge pull request #99 from openshift-bot/art-consistency-openshift-4…
Browse files Browse the repository at this point in the history
….15-ose-image-customization-controller

OCPBUGS-19186: Updating ose-image-customization-controller images to be consistent with ART
  • Loading branch information
openshift-merge-robot committed Sep 26, 2023
2 parents 9dd0230 + d5e27f5 commit 5766864
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 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.20-openshift-4.14
tag: rhel-8-release-golang-1.20-openshift-4.15
4 changes: 2 additions & 2 deletions Dockerfile
@@ -1,10 +1,10 @@
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.14 AS builder
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15 AS builder
WORKDIR /go/src/github.com/openshift/image-customization-controller
COPY . .
RUN CGO_ENABLED=0 GO111MODULE=on go build -mod=vendor -a -o bin/image-customization-controller cmd/controller/main.go
RUN CGO_ENABLED=0 GO111MODULE=on go build -mod=vendor -a -o bin/image-customization-server cmd/static-server/main.go

FROM registry.ci.openshift.org/ocp/4.14:base
FROM registry.ci.openshift.org/ocp/4.15:base
COPY --from=builder /go/src/github.com/openshift/image-customization-controller/bin/image-customization-controller /
COPY --from=builder /go/src/github.com/openshift/image-customization-controller/bin/image-customization-server /

Expand Down

0 comments on commit 5766864

Please sign in to comment.