Skip to content

Commit 68a7999

Browse files
committed
openshift/os: simplify image definitions
First, stop using the `fcos-buildroot` image. It's no longer defined in this repo and we don't strictly need it. Instead, use cosa as the buildroot. This then allows us to get rid of the redundant `base_images` definition, and use the `root` image as our `from`. Use `FROM overridden` in the Dockerfile literal to make it clear that it's always going to be overridden anyway.
1 parent 68e8b51 commit 68a7999

File tree

1 file changed

+4
-13
lines changed

1 file changed

+4
-13
lines changed

ci-operator/config/openshift/os/openshift-os-master.yaml

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,11 @@
1-
base_images:
2-
coreos_coreos-assembler_latest:
3-
name: coreos-assembler
4-
namespace: coreos
5-
tag: latest
61
build_root:
72
image_stream_tag:
8-
name: fcos-buildroot
3+
name: coreos-assembler
94
namespace: coreos
10-
tag: testing-devel
5+
tag: latest
116
images:
127
- dockerfile_literal: |
13-
# COSA + source code
14-
FROM registry.ci.openshift.org/coreos/coreos-assembler:latest
8+
FROM overridden
159
WORKDIR /src
1610
# Tell the build scripts that we have setup a directory for unprivileged build
1711
ENV COSA_DIR=/tmp/cosa
@@ -29,10 +23,7 @@ images:
2923
# Go back to unprivileged user for COSA
3024
USER builder
3125
WORKDIR /tmp/cosa
32-
inputs:
33-
coreos_coreos-assembler_latest:
34-
as:
35-
- registry.ci.openshift.org/coreos/coreos-assembler:latest
26+
from: root
3627
to: build-image
3728
promotion:
3829
to:

0 commit comments

Comments
 (0)