@@ -6,18 +6,10 @@

 #

 FROM openshift/origin-base

-RUN yum install -y gcc make openssl-devel pcre-devel tar wget socat && \

-    wget http://www.haproxy.org/download/1.5/src/haproxy-1.5.10.tar.gz  && \

-    tar xvzf haproxy-1.5.10.tar.gz && \

-    groupadd haproxy && \

-    useradd -g haproxy haproxy && \

-    cd haproxy-1.5.10 && make TARGET=linux2628 CPU=generic USE_PCRE=1 USE_OPENSSL=1 USE_ZLIB=1 && make install && \

-    cd .. && rm -rf haproxy-1.5.10 && \

-    mkdir -p /usr/bin && \

+RUN yum -y install haproxy && \

     mkdir -p /var/lib/containers/router/{certs,cacerts} && \

     mkdir -p /var/lib/haproxy/{conf,run,bin,log} && \

     touch /var/lib/haproxy/conf/{{os_http_be,os_tcp_be,os_sni_passthrough,os_reencrypt}.map,haproxy.config} && \

-    yum -y remove gcc && \

     yum clean all

 ADD conf/ /var/lib/haproxy/conf/

@@ -9,7 +9,7 @@ if [ -f $pid_file ]; then

 fi

 if [ -n "$old_pid" ]; then

-  /usr/local/sbin/haproxy -f $config_file -p $pid_file -sf $old_pid

+  /usr/sbin/haproxy -f $config_file -p $pid_file -sf $old_pid

 else

-  /usr/local/sbin/haproxy -f $config_file -p $pid_file

+  /usr/sbin/haproxy -f $config_file -p $pid_file

 fi