diff --git a/Dockerfile-amzn2 b/Dockerfile-amzn2 new file mode 100644 index 0000000..7cf3688 --- /dev/null +++ b/Dockerfile-amzn2 @@ -0,0 +1,12 @@ +FROM amazonlinux:2 + +RUN yum install -y pcre-devel make gcc openssl-devel rpm-build systemd-devel curl sed zlib-devel +RUN mkdir RPMS +RUN chmod -R 777 RPMS +RUN mkdir SPECS +RUN mkdir SOURCES +COPY Makefile Makefile +COPY SPECS/haproxy.spec SPECS/haproxy.spec +COPY SOURCES/* SOURCES/ + +CMD make NO_SUDO=1 && cp /rpmbuild/RPMS/x86_64/* /RPMS && cp /rpmbuild/SRPMS/* /RPMS \ No newline at end of file diff --git a/Dockerfile8 b/Dockerfile8 index f5c26ea..fa8ee82 100644 --- a/Dockerfile8 +++ b/Dockerfile8 @@ -1,5 +1,7 @@ FROM centos:8 +RUN sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-Linux-* && \ + sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-Linux-* RUN yum install -y pcre-devel make gcc openssl-devel rpm-build systemd-devel curl sed zlib-devel RUN mkdir RPMS RUN chmod -R 777 RPMS diff --git a/Makefile b/Makefile index ce73bdf..e9040b0 100644 --- a/Makefile +++ b/Makefile @@ -46,12 +46,14 @@ endif build-docker: docker build -t haproxy-rpm-builder7:${VERSION}-${RELEASE} -f Dockerfile7 . docker build -t haproxy-rpm-builder8:${VERSION}-${RELEASE} -f Dockerfile8 . + docker build -t haproxy-rpm-builder-amzn2:${VERSION}-${RELEASE} -f Dockerfile-amzn2 . run-docker: build-docker mkdir -p RPMS chcon -Rt svirt_sandbox_file_t RPMS || true docker run --volume $(HOME)/RPMS:/RPMS --rm haproxy-rpm-builder7:${VERSION}-${RELEASE} docker run --volume $(HOME)/RPMS:/RPMS --rm haproxy-rpm-builder8:${VERSION}-${RELEASE} + docker run --volume $(HOME)/RPMS:/RPMS --rm haproxy-rpm-builder-amzn2:${VERSION}-${RELEASE} build: $(build_stages) cp -r ./SPECS/* ./rpmbuild/SPECS/ || true diff --git a/SPECS/haproxy.spec b/SPECS/haproxy.spec index cb4f6d6..23933b8 100644 --- a/SPECS/haproxy.spec +++ b/SPECS/haproxy.spec @@ -231,6 +231,9 @@ fi %endif %changelog +* Thu Feb 10 2022 Kai Parry +- Add Docker support for Amazon Linux 2 + * Sat May 30 2021 David Bezemer - Add support for HAProxy 2.4.x