Skip to content

Updating cluster-logging-operator builder & base images to be consistent with ART #730

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Oct 14, 2020
Merged

Updating cluster-logging-operator builder & base images to be consistent with ART #730

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.6 AS builder
FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.7 AS builder
WORKDIR /go/src/github.com/openshift/cluster-logging-operator

# COPY steps are in the reverse order of frequency of change
Expand All @@ -17,9 +17,9 @@ COPY pkg ./pkg

RUN make build

FROM registry.svc.ci.openshift.org/ocp/4.6:cli as origincli
FROM registry.svc.ci.openshift.org/ocp/4.7:cli AS origincli

FROM registry.svc.ci.openshift.org/ocp/4.6:base
FROM registry.svc.ci.openshift.org/ocp/4.7:base
RUN INSTALL_PKGS=" \
openssl \
rsync \
Expand Down