From 74ebd7c18d72a1ff107013ee4033cdd778638911 Mon Sep 17 00:00:00 2001
From: Miro Stauder <miro@nixnux.net>
Date: Fri, 4 Feb 2022 21:51:12 +0000
Subject: [PATCH] add almalinux

---
 Makefile           | 46 +++++++++++++++++++++++++++++++++++++-
 docker-compose.yml | 55 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 100 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 047e8dbb8..d98231235 100644
--- a/Makefile
+++ b/Makefile
@@ -187,13 +187,34 @@ clean:
 packages: amd64-packages arm64-packages
 .PHONY: packages
 
-amd64-packages: centos6 centos6-dbg centos6.7 centos6.7-dbg centos7 centos7-dbg centos8 centos8-clang centos8-dbg ubuntu14 ubuntu14-dbg ubuntu16 ubuntu16-dbg ubuntu18 ubuntu18-dbg ubuntu20 ubuntu20-clang ubuntu20-dbg debian8 debian8-dbg debian9 debian9-dbg debian10 debian10-dbg debian11 debian11-clang debian11-dbg fedora24 fedora24-dbg fedora27 fedora27-dbg fedora28 fedora28-dbg fedora33 fedora33-dbg fedora34 fedora34-clang fedora34-dbg opensuse15 opensuse15-clang opensuse15-dbg
+amd64-packages: amd64-centos amd64-ubuntu amd64-debian amd64-fedora amd64-opensuse amd64-almalinux
 .PHONY: amd64-packages
 
+amd64-centos: centos6 centos6-dbg centos7 centos7-dbg centos8 centos8-clang centos8-dbg
+.PHONY: amd64-centos
+
+amd64-ubuntu: ubuntu14 ubuntu14-dbg ubuntu16 ubuntu16-dbg ubuntu18 ubuntu18-dbg ubuntu20 ubuntu20-clang ubuntu20-dbg
+.PHONY: amd64-ubuntu
+
+amd64-debian: debian8 debian8-dbg debian9 debian9-dbg debian10 debian10-dbg debian11 debian11-clang debian11-dbg
+.PHONY: amd64-debian
+
+amd64-fedora:  fedora24 fedora24-dbg fedora27 fedora27-dbg fedora28 fedora28-dbg fedora33 fedora33-dbg fedora34 fedora34-clang fedora34-dbg
+.PHONY: amd64-fedora
+
+amd64-opensuse: opensuse15 opensuse15-clang opensuse15-dbg
+.PHONY: amd64-opensuse
+
+amd64-almalinux: almalinux8 almalinux8-clang almalinux8-dbg
+.PHONY: amd64-almalinux
+
+
+
 arm64-packages: centos7-arm64 centos8-arm64 debian9-arm64 debian10-arm64 debian11-arm64 ubuntu18-arm64 ubuntu20-arm64 fedora32-arm64 fedora33-arm64
 .PHONY: arm64-packages
 
 
+
 centos5: binaries/proxysql-${CURVER}-1-centos5.x86_64.rpm
 .PHONY: centos5
 
@@ -384,6 +405,16 @@ opensuse15-dbg: binaries/proxysql-${CURVER}-1-opensuse15-dbg.x86_64.rpm
 .PHONY: opensuse15-dbg
 
 
+almalinux8: binaries/proxysql-${CURVER}-1-almalinux8.x86_64.rpm
+.PHONY: almalinux8
+
+almalinux8-clang: binaries/proxysql-${CURVER}-1-almalinux8-clang.x86_64.rpm
+.PHONY: almalinux8-clang
+
+almalinux8-dbg: binaries/proxysql-${CURVER}-1-almalinux8-dbg.x86_64.rpm
+.PHONY: almalinux8-dbg
+
+
 
 binaries/proxysql-${CURVER}-1-centos5.x86_64.rpm:
 	docker-compose up centos5_build
@@ -638,6 +669,19 @@ binaries/proxysql-${CURVER}-1-opensuse15-dbg.x86_64.rpm:
 	docker-compose rm -f
 
 
+binaries/proxysql-${CURVER}-1-almalinux8.x86_64.rpm:
+	docker-compose up almalinux8_build
+	docker-compose rm -f
+
+binaries/proxysql-${CURVER}-1-almalinux8-clang.x86_64.rpm:
+	docker-compose up almalinux8_clang_build
+	docker-compose rm -f
+
+binaries/proxysql-${CURVER}-1-almalinux8-dbg.x86_64.rpm:
+	docker-compose up almalinux8_dbg_build
+	docker-compose rm -f
+
+
 
 .PHONY: cleanall
 cleanall:
diff --git a/docker-compose.yml b/docker-compose.yml
index b39fa73f9..64163d88f 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,7 @@
 version: "2.0"
 services:
 
+
   centos6_build:
     image: proxysql/packaging:build-centos6
     volumes:
@@ -179,6 +180,7 @@ services:
     command:
       - /opt/entrypoint/entrypoint.bash
 
+
   fedora24_build:
     image: proxysql/packaging:build-fedora24
     volumes:
@@ -387,6 +389,7 @@ services:
     command:
       - /opt/entrypoint/entrypoint.bash
 
+
   debian8_build:
     image: proxysql/packaging:build-debian8
     volumes:
@@ -610,6 +613,7 @@ services:
     command:
       - /opt/entrypoint/entrypoint.bash
 
+
   ubuntu14_build:
     image: proxysql/packaging:build-ubuntu14
     volumes:
@@ -785,6 +789,7 @@ services:
     command:
       - /opt/entrypoint/entrypoint.bash
 
+
   opensuse15_build:
     image: proxysql/packaging:build-opensuse15
     volumes:
@@ -832,3 +837,53 @@ services:
       - PROXYSQL_BUILD_ARCH=x86_64
     command:
       - /opt/entrypoint/entrypoint.bash
+
+
+  almalinux8_build:
+    image: proxysql/packaging:build-almalinux8
+    volumes:
+      - ./docker/images/proxysql/rhel-compliant/rpmmacros/:/root/
+      - ./docker/images/proxysql/rhel-compliant/entrypoint/:/opt/entrypoint/
+      - ./:/opt/proxysql/
+    environment:
+      - MAKE
+      - MAKEOPT
+      - CURVER
+      - PKG_RELEASE=almalinux8
+      - PROXYSQL_BUILD_TYPE=clickhouse
+      - PROXYSQL_BUILD_ARCH=x86_64
+    command:
+      - /opt/entrypoint/entrypoint.bash
+
+  almalinux8_clang_build:
+    image: proxysql/packaging:build-clang-almalinux8
+    volumes:
+      - ./docker/images/proxysql/rhel-compliant/rpmmacros/:/root/
+      - ./docker/images/proxysql/rhel-compliant/entrypoint/:/opt/entrypoint/
+      - ./:/opt/proxysql/
+    environment:
+      - MAKE
+      - MAKEOPT
+      - CURVER
+      - PKG_RELEASE=almalinux8-clang
+      - PROXYSQL_BUILD_TYPE=clickhouse
+      - PROXYSQL_BUILD_ARCH=x86_64
+    command:
+      - /opt/entrypoint/entrypoint.bash
+
+  almalinux8_dbg_build:
+    image: proxysql/packaging:build-almalinux8
+    volumes:
+      - ./docker/images/proxysql/rhel-compliant/rpmmacros/:/root/
+      - ./docker/images/proxysql/rhel-compliant/entrypoint/:/opt/entrypoint/
+      - ./:/opt/proxysql/
+    environment:
+      - MAKE
+      - MAKEOPT
+      - CURVER
+      - PKG_RELEASE=dbg-almalinux8
+      - PROXYSQL_BUILD_TYPE=debug
+      - PROXYSQL_BUILD_ARCH=x86_64
+    command:
+      - /opt/entrypoint/entrypoint.bash
+