Skip to content

Commit 17771fe

Browse files
Move the CBS repo from source to base image
When we are building images for projects other than Origin, we will override or circumvent the `openshift/origin-source` image to allow us to inject RPM repos for the other projects in question. The CBS repo has nothing to do with the RPM repo injection process and would have to be re-created in all of the over-rides, so it makes sense to move it to the `openshift/origin-base` definition and to not require that other projects remember to add in the CBS repo. Signed-off-by: Steve Kuznetsov <[email protected]>
1 parent e9bb78b commit 17771fe

File tree

2 files changed

+1
-0
lines changed

2 files changed

+1
-0
lines changed

images/base/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#
77
FROM openshift/origin-source
88

9+
COPY *.repo /etc/yum.repos.d/
910
RUN INSTALL_PKGS="bsdtar ceph-common device-mapper device-mapper-persistent-data e2fsprogs ethtool findutils git hostname iptables lsof nmap-ncat socat sysvinit-tools tar tree util-linux wget which xfsprogs" && \
1011
yum install -y centos-release-ceph-luminous && \
1112
rpm -V centos-release-ceph-luminous && \

0 commit comments

Comments
 (0)