Skip to content
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
base_images:
os:
name: ubi
name: builder
namespace: ocp
tag: "8"
tag: rhel-8-base-openshift-4.6
os-minimal:
name: ubi-minimal
name: builder
namespace: ocp
tag: "8"
tag: rhel-8-base-openshift-4.6
Comment on lines +3 to +9
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm probably out of the loop, but can you explain this change?

Am I understanding correctly that with this change, there would be no distinction between os and os-minimal? Is there a minimal version of this image?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@joelanford - context can be found in aos-devel thread [aos-devel] [Action Required] Promotion Dockerfiles will be synced from ocp-build-data .

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Downstream product builds do not build on ubi8 minimal. This change ensure that your image builds on the same base as ART.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there any reason we don't consolidate and remove the os-minimal base image and update any references to it to use os since os and os-minimal are now identical.

That might help reduce confusion for our future selves. If so, that definitely seems like something that can be done in a follow-up.

build_root:
image_stream_tag:
name: release
namespace: openshift
tag: golang-1.13
tag: rhel-8-release-openshift-4.6
images:
- dockerfile_path: ci/dockerfiles/builder.Dockerfile
from: root
to: osdk-builder
- dockerfile_path: release/ansible/upstream.Dockerfile
- dockerfile_path: release/ansible/Dockerfile.rhel8
from: os
to: ansible-operator
- dockerfile_path: release/helm/upstream.Dockerfile
- dockerfile_path: release/helm/Dockerfile
from: os-minimal
to: helm-operator
- dockerfile_path: ci/dockerfiles/ansible-e2e.Dockerfile
Expand Down