diff --git a/hack/Dockerfile.debug b/hack/Dockerfile.debug index 356eef79e..978dc2457 100644 --- a/hack/Dockerfile.debug +++ b/hack/Dockerfile.debug @@ -1,5 +1,5 @@ FROM registry.access.redhat.com/ubi8/ubi -RUN yum install -y https://github.com/frobware/haproxy-builds/raw/master/rhaos-4.14-rhel-8/haproxy26-2.6.13-2.rhaos4.14.el8.x86_64.rpm +RUN yum install -y https://github.com/frobware/haproxy-builds/raw/master/rhaos-4.16-rhel-9/haproxy28-2.8.5-1.rhaos4.16.el9.x86_64.rpm RUN haproxy -vv RUN INSTALL_PKGS="rsyslog procps-ng util-linux socat" && \ yum install -y $INSTALL_PKGS && \ diff --git a/images/router/haproxy/Dockerfile b/images/router/haproxy/Dockerfile index 88bc73126..c2dbcd29c 100644 --- a/images/router/haproxy/Dockerfile +++ b/images/router/haproxy/Dockerfile @@ -1,5 +1,5 @@ FROM registry.svc.ci.openshift.org/openshift/origin-v4.0:base-router -RUN INSTALL_PKGS="haproxy26 rsyslog sysvinit-tools" && \ +RUN INSTALL_PKGS="haproxy28 rsyslog sysvinit-tools" && \ yum install -y $INSTALL_PKGS && \ rpm -V $INSTALL_PKGS && \ yum clean all && \ diff --git a/images/router/haproxy/Dockerfile.rhel b/images/router/haproxy/Dockerfile.rhel index ee94b156f..98417c118 100644 --- a/images/router/haproxy/Dockerfile.rhel +++ b/images/router/haproxy/Dockerfile.rhel @@ -1,5 +1,5 @@ FROM registry.svc.ci.openshift.org/ocp/4.0:base-router -RUN INSTALL_PKGS="haproxy26 rsyslog sysvinit-tools" && \ +RUN INSTALL_PKGS="haproxy28 rsyslog sysvinit-tools" && \ yum install -y $INSTALL_PKGS && \ rpm -V $INSTALL_PKGS && \ yum clean all && \ diff --git a/images/router/haproxy/Dockerfile.rhel8 b/images/router/haproxy/Dockerfile.rhel8 index 3da2ed12f..1695ee29d 100644 --- a/images/router/haproxy/Dockerfile.rhel8 +++ b/images/router/haproxy/Dockerfile.rhel8 @@ -1,5 +1,5 @@ FROM registry.ci.openshift.org/ocp/4.16:haproxy-router-base -RUN INSTALL_PKGS="haproxy26 rsyslog procps-ng util-linux" && \ +RUN INSTALL_PKGS="haproxy28 rsyslog procps-ng util-linux" && \ yum install -y $INSTALL_PKGS && \ rpm -V $INSTALL_PKGS && \ yum clean all && \ diff --git a/images/router/haproxy/conf/haproxy-config.template b/images/router/haproxy/conf/haproxy-config.template index 797db3226..c722685b1 100644 --- a/images/router/haproxy/conf/haproxy-config.template +++ b/images/router/haproxy/conf/haproxy-config.template @@ -330,6 +330,7 @@ frontend fe_sni {{- if $haveCRLs }} crl-file /var/lib/haproxy/mtls/latest/crls.pem {{ end }} {{- end }} {{- end }} + {{- "" }} no-alpn mode http {{- range $idx, $captureHeader := .CaptureHTTPRequestHeaders }} @@ -440,6 +441,7 @@ frontend fe_no_sni {{- if $haveCRLs }} crl-file /var/lib/haproxy/mtls/latest/crls.pem {{ end }} {{- end }} {{- end }} + {{- "" }} no-alpn mode http {{- range $idx, $captureHeader := .CaptureHTTPRequestHeaders }}