Skip to content

Commit 85e51a1

Browse files
committed
use temp scratch repo for haproxy22 rpm
1 parent e5035c5 commit 85e51a1

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,16 @@ RUN microdnf install gcc glibc-devel \
66
lua-libs make openssl openssl-devel \
77
pcre-devel tar zlib-devel gzip redhat-rpm-config diffutils
88

9-
RUN mkdir /usr/src/haproxy && \
10-
curl -s -o- https://www.haproxy.org/download/2.3/src/haproxy-2.3.17.tar.gz | tar --strip-components=1 -C /usr/src/haproxy -zxf -
9+
ADD scratch.repo /etc/yum/repos.d/scratch.repo
1110

12-
RUN cd /usr/src/haproxy && make -j16 CPU=generic TARGET=linux-glibc USE_OPENSSL=1 USE_PCRE=1 USE_ZLIB=1 USE_CRYPT_H=1 USE_LINUX_TPROXY=1 USE_GETADDRINFO=1 USE_REGPARM=1 EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o" 'ADDINC=-O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions -fstack-protector-strong -grecord-gcc-switches -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection' 'ADDLIB=-Wl,-z,relro -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld'
11+
RUN microdnf install -y haproxy22
1312

1413
FROM --copy=builder registry.access.redhat.com/ubi8/ubi-minimal
1514

1615
LABEL maintainer="Guillaume Abrioux <[email protected]>"
1716
LABEL com.redhat.component="haproxy-container"
1817
LABEL name="haproxy"
19-
LABEL version="2.3.17"
18+
LABEL version="2.2.19"
2019
LABEL description="HAProxy container"
2120
LABEL summary="Provides HAproxy container."
2221
LABEL io.k8s.display-name="HAProxy container"

scratch.repo

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[brew-task-repo-haproxy-2.2.19-3.el8cp-scratch]
2+
name=Repo for Brew scratch build of haproxy-2.2.19-3.el8cp
3+
enabled=1
4+
gpgcheck=0
5+
baseurl=http://brew-task-repos.usersys.redhat.com/repos/scratch/jcaratza/haproxy/2.2.19/3.el8cp/$basearch/
6+
module_hotfixes=1

0 commit comments

Comments
 (0)