Merge pull request #3884 from sysown/add-almalinux9-builds

add almalinux9 builds
sysown · May 30, 2022 · 3afcc12 · 3afcc12
2 parents 8592edb + cb61e16
commit 3afcc12
Show file tree

Hide file tree

Showing 2 changed files with 77 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -208,7 +208,7 @@ amd64-fedora: fedora27 fedora27-dbg fedora28 fedora28-dbg fedora33 fedora33-dbg
 amd64-opensuse: opensuse15 opensuse15-clang opensuse15-dbg
 .PHONY: amd64-opensuse
 
-amd64-almalinux: almalinux8 almalinux8-clang almalinux8-dbg
+amd64-almalinux: almalinux8 almalinux8-clang almalinux8-dbg almalinux9 almalinux9-clang almalinux9-dbg
 .PHONY: amd64-almalinux
 
 
@@ -232,7 +232,7 @@ arm64-fedora: fedora33-arm64 fedora34-arm64
 arm64-opensuse: opensuse15-arm64
 .PHONY: arm64-opensuse
 
-arm64-almalinux: almalinux8-arm64
+arm64-almalinux: almalinux8-arm64 almalinux9-arm64
 .PHONY: arm64-almalinux
 
 
@@ -425,6 +425,19 @@ almalinux8-dbg: binaries/proxysql-${CURVER}-1-almalinux8-dbg.x86_64.rpm
 .PHONY: almalinux8-dbg
 
 
+almalinux9: binaries/proxysql-${CURVER}-1-almalinux9.x86_64.rpm
+.PHONY: almalinux8
+
+almalinux9-arm64: binaries/proxysql-${CURVER}-1-almalinux9.aarch64.rpm
+.PHONY: almalinux9-arm64
+
+almalinux9-clang: binaries/proxysql-${CURVER}-1-almalinux9-clang.x86_64.rpm
+.PHONY: almalinux9-clang
+
+almalinux9-dbg: binaries/proxysql-${CURVER}-1-almalinux9-dbg.x86_64.rpm
+.PHONY: almalinux9-dbg
+
+
 
 binaries/proxysql-${CURVER}-1-centos6.x86_64.rpm:
 	docker-compose up centos6_build
@@ -668,6 +681,23 @@ binaries/proxysql-${CURVER}-1-almalinux8-dbg.x86_64.rpm:
 	docker-compose rm -f
 
 
+binaries/proxysql-${CURVER}-1-almalinux9.x86_64.rpm:
+	docker-compose up almalinux9_build
+	docker-compose rm -f
+
+binaries/proxysql-${CURVER}-1-almalinux9.aarch64.rpm:
+	docker-compose up almalinux9_build
+	docker-compose rm -f
+
+binaries/proxysql-${CURVER}-1-almalinux9-clang.x86_64.rpm:
+	docker-compose up almalinux9_clang_build
+	docker-compose rm -f
+
+binaries/proxysql-${CURVER}-1-almalinux9-dbg.x86_64.rpm:
+	docker-compose up almalinux9_dbg_build
+	docker-compose rm -f
+
+
 
 .PHONY: cleanall
 cleanall:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -649,3 +649,48 @@ services:
     command:
       - /opt/entrypoint/entrypoint.bash
 
+  almalinux9_build:
+    image: proxysql/packaging:build-almalinux9
+    volumes:
+      - ./docker/images/proxysql/rhel-compliant/rpmmacros/:/root/
+      - ./docker/images/proxysql/rhel-compliant/entrypoint/:/opt/entrypoint/
+      - ./:/opt/proxysql/
+    environment:
+      - MAKE
+      - MAKEOPT
+      - CURVER
+      - PKG_RELEASE=almalinux9
+      - PROXYSQL_BUILD_TYPE=clickhouse
+    command:
+      - /opt/entrypoint/entrypoint.bash
+
+  almalinux9_clang_build:
+    image: proxysql/packaging:build-clang-almalinux9
+    volumes:
+      - ./docker/images/proxysql/rhel-compliant/rpmmacros/:/root/
+      - ./docker/images/proxysql/rhel-compliant/entrypoint/:/opt/entrypoint/
+      - ./:/opt/proxysql/
+    environment:
+      - MAKE
+      - MAKEOPT
+      - CURVER
+      - PKG_RELEASE=almalinux9-clang
+      - PROXYSQL_BUILD_TYPE=clickhouse
+    command:
+      - /opt/entrypoint/entrypoint.bash
+
+  almalinux9_dbg_build:
+    image: proxysql/packaging:build-almalinux9
+    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-almalinux9
+      - PROXYSQL_BUILD_TYPE=debug
+    command:
+      - /opt/entrypoint/entrypoint.bash
+