Commit 68a7999
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
1 file changed
+4
-13
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
2 | | - | |
3 | | - | |
4 | | - | |
5 | | - | |
6 | 1 | | |
7 | 2 | | |
8 | | - | |
| 3 | + | |
9 | 4 | | |
10 | | - | |
| 5 | + | |
11 | 6 | | |
12 | 7 | | |
13 | | - | |
14 | | - | |
| 8 | + | |
15 | 9 | | |
16 | 10 | | |
17 | 11 | | |
| |||
29 | 23 | | |
30 | 24 | | |
31 | 25 | | |
32 | | - | |
33 | | - | |
34 | | - | |
35 | | - | |
| 26 | + | |
36 | 27 | | |
37 | 28 | | |
38 | 29 | | |
| |||
0 commit comments