Skip to content

Commit 90a1310

Browse files
committed
Allow haproxy from CentOs
1 parent 00c6589 commit 90a1310

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

images/base/cbs-paas7-openshift-multiarch-el7-build.repo

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ baseurl = http://cbs.centos.org/kojifiles/repos/paas7-openshift-multiarch-el7-bu
44
enabled = 1
55
gpgcheck = 0
66
sslverify = 0
7-
skip_if_unavailable = 1
8-
includepkgs = golang* protobuf* goversioninfo* openvswitch*
7+
skip_if_unavailable = 0
8+
includepkgs = golang* protobuf* goversioninfo* openvswitch* haproxy*

images/router/haproxy/Dockerfile

+1-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66
FROM openshift/origin
77

88
RUN INSTALL_PKGS="haproxy18" && \
9-
yum install yum-utils && \
10-
yum-config-manager --add http://cbs.centos.org/repos/paas7-openshift-origin38-testing/x86_64/os/ && \
11-
yum install --nogpgcheck -y $INSTALL_PKGS && \
9+
yum install -y $INSTALL_PKGS && \
1210
rpm -V $INSTALL_PKGS && \
1311
yum clean all && \
1412
mkdir -p /var/lib/haproxy/router/{certs,cacerts} && \

0 commit comments

Comments
 (0)