Skip to content

Bug 1872080: Updating release/ansible/Dockerfile.rhel8 and release/helm/Dockerfile baseimages to match ocp-build-data config #71

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
merged 2 commits into from
Aug 26, 2020
Merged

Bug 1872080: Updating release/ansible/Dockerfile.rhel8 and release/helm/Dockerfile baseimages to match ocp-build-data config #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c98e665
Updating release/ansible/Dockerfile.rhel8 baseimages to mach ocp-buil…
openshift-bot Aug 24, 2020
d40b1fe
Updating release/helm/Dockerfile baseimages to mach ocp-build-data co…
openshift-bot Aug 24, 2020
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
4 changes: 2 additions & 2 deletions release/ansible/Dockerfile.rhel8
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM openshift/origin-release:golang-1.13 AS builder
FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6 AS builder

ENV GO111MODULE=on \
GOFLAGS=-mod=vendor
Expand All @@ -7,7 +7,7 @@ COPY . /go/src/github.com/operator-framework/operator-sdk
RUN cd /go/src/github.com/operator-framework/operator-sdk \
&& make build/ansible-operator VERSION=$(git describe --tags --always)

FROM registry.access.redhat.com/ubi8/ubi
FROM registry.svc.ci.openshift.org/ocp/4.6:base

RUN yum install -y \
ansible \
Expand Down
4 changes: 2 additions & 2 deletions release/helm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM openshift/origin-release:golang-1.13 AS builder
FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6 AS builder

ENV GO111MODULE=on \
GOFLAGS=-mod=vendor
Expand All @@ -7,7 +7,7 @@ COPY . /go/src/github.com/operator-framework/operator-sdk
RUN cd /go/src/github.com/operator-framework/operator-sdk \
&& make build/helm-operator VERSION=$(git describe --tags --always)

FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
FROM registry.svc.ci.openshift.org/ocp/4.6:base

ENV OPERATOR=/usr/local/bin/helm-operator \
USER_UID=1001 \
Expand Down