From d7d78338b0a9382540d3f3a654118455b7ab46a5 Mon Sep 17 00:00:00 2001 From: Miro Stauder Date: Thu, 2 Oct 2025 09:48:53 +0000 Subject: [PATCH 1/5] add centos10 --- Makefile | 4 ++-- docker-compose.yml | 28 ++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 82386f6ad..49bd99aab 100644 --- a/Makefile +++ b/Makefile @@ -316,7 +316,7 @@ pkglist: $(REL_ARCH)-pkglist amd64-%: SYS_ARCH := x86_64 amd64-packages: amd64-centos amd64-ubuntu amd64-debian amd64-fedora amd64-opensuse amd64-almalinux amd64-almalinux: almalinux8 almalinux8-clang almalinux8-dbg almalinux9 almalinux9-clang almalinux9-dbg -amd64-centos: centos9 centos9-clang centos9-dbg +amd64-centos: centos9 centos9-clang centos9-dbg centos10 centos10-clang centos10-dbg amd64-debian: debian12 debian12-clang debian12-dbg amd64-fedora: fedora40 fedora40-clang fedora40-dbg fedora41 fedora41-clang fedora41-dbg fedora42 fedora42-clang fedora42-dbg amd64-opensuse: opensuse15 opensuse15-clang opensuse15-dbg @@ -327,7 +327,7 @@ amd64-pkglist: arm64-%: SYS_ARCH := aarch64 arm64-packages: arm64-centos arm64-debian arm64-ubuntu arm64-fedora arm64-opensuse arm64-almalinux arm64-almalinux: almalinux8 almalinux9 -arm64-centos: centos9 +arm64-centos: centos9 centos10 arm64-debian: debian12 arm64-fedora: fedora40 fedora41 fedora42 arm64-opensuse: opensuse15 diff --git a/docker-compose.yml b/docker-compose.yml index ad190c44f..af627dbf3 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -47,6 +47,34 @@ services: - PKG_RELEASE=dbg-centos9 - PROXYSQL_BUILD_TYPE=debug +#################################################################################################### + centos10_build: + extends: + service: _build + image: proxysql/packaging:build-centos10-v3.0.2 + volumes: + - ./docker/images/proxysql/rhel-compliant/rpmmacros/rpmbuild/:/root/rpmbuild/ + - ./docker/images/proxysql/rhel-compliant/rpmmacros/.rpmmacros:/root/.rpmmacros + - ./docker/images/proxysql/rhel-compliant/entrypoint/:/opt/entrypoint/ + - ./:/opt/proxysql/ + environment: + - PKG_RELEASE=centos10 + - PROXYSQL_BUILD_TYPE=clickhouse + + centos10_clang_build: + extends: + service: centos10_build + image: proxysql/packaging:build-clang-centos10-v3.0.2 + environment: + - PKG_RELEASE=centos10-clang + + centos10_dbg_build: + extends: + service: centos10_build + environment: + - PKG_RELEASE=dbg-centos10 + - PROXYSQL_BUILD_TYPE=debug + #################################################################################################### #################################################################################################### fedora40_build: From e3a69b04cd590fe558954747b6a074e121438d82 Mon Sep 17 00:00:00 2001 From: Miro Stauder Date: Thu, 2 Oct 2025 09:49:09 +0000 Subject: [PATCH 2/5] add almalinux10 --- Makefile | 4 ++-- docker-compose.yml | 27 +++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 49bd99aab..7a4de6f7d 100644 --- a/Makefile +++ b/Makefile @@ -315,7 +315,7 @@ pkglist: $(REL_ARCH)-pkglist amd64-%: SYS_ARCH := x86_64 amd64-packages: amd64-centos amd64-ubuntu amd64-debian amd64-fedora amd64-opensuse amd64-almalinux -amd64-almalinux: almalinux8 almalinux8-clang almalinux8-dbg almalinux9 almalinux9-clang almalinux9-dbg +amd64-almalinux: almalinux8 almalinux8-clang almalinux8-dbg almalinux9 almalinux9-clang almalinux9-dbg almalinux10 almalinux10-clang almalinux10-dbg amd64-centos: centos9 centos9-clang centos9-dbg centos10 centos10-clang centos10-dbg amd64-debian: debian12 debian12-clang debian12-dbg amd64-fedora: fedora40 fedora40-clang fedora40-dbg fedora41 fedora41-clang fedora41-dbg fedora42 fedora42-clang fedora42-dbg @@ -326,7 +326,7 @@ amd64-pkglist: arm64-%: SYS_ARCH := aarch64 arm64-packages: arm64-centos arm64-debian arm64-ubuntu arm64-fedora arm64-opensuse arm64-almalinux -arm64-almalinux: almalinux8 almalinux9 +arm64-almalinux: almalinux8 almalinux9 almalinux10 arm64-centos: centos9 centos10 arm64-debian: debian12 arm64-fedora: fedora40 fedora41 fedora42 diff --git a/docker-compose.yml b/docker-compose.yml index af627dbf3..2da13223f 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -329,6 +329,33 @@ services: - PKG_RELEASE=dbg-almalinux9 - PROXYSQL_BUILD_TYPE=debug +#################################################################################################### + almalinux10_build: + extends: + service: _build + image: proxysql/packaging:build-almalinux10-v3.0.2 + volumes: + - ./docker/images/proxysql/rhel-compliant/rpmmacros/rpmbuild/:/root/rpmbuild/ + - ./docker/images/proxysql/rhel-compliant/rpmmacros/.rpmmacros:/root/.rpmmacros + - ./docker/images/proxysql/rhel-compliant/entrypoint/:/opt/entrypoint/ + - ./:/opt/proxysql/ + environment: + - PKG_RELEASE=almalinux10 + - PROXYSQL_BUILD_TYPE=clickhouse + + almalinux10_clang_build: + extends: + service: almalinux10_build + image: proxysql/packaging:build-clang-almalinux10-v3.0.2 + environment: + - PKG_RELEASE=almalinux10-clang + + almalinux10_dbg_build: + extends: + service: almalinux10_build + environment: + - PKG_RELEASE=dbg-almalinux10 + - PROXYSQL_BUILD_TYPE=debug #################################################################################################### #################################################################################################### From 894afc5a37a41f8032740e1c20c51c22ff723dca Mon Sep 17 00:00:00 2001 From: Miro Stauder Date: Thu, 2 Oct 2025 09:48:53 +0000 Subject: [PATCH 3/5] add centos10 --- Makefile | 4 ++-- docker-compose.yml | 28 ++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 82386f6ad..49bd99aab 100644 --- a/Makefile +++ b/Makefile @@ -316,7 +316,7 @@ pkglist: $(REL_ARCH)-pkglist amd64-%: SYS_ARCH := x86_64 amd64-packages: amd64-centos amd64-ubuntu amd64-debian amd64-fedora amd64-opensuse amd64-almalinux amd64-almalinux: almalinux8 almalinux8-clang almalinux8-dbg almalinux9 almalinux9-clang almalinux9-dbg -amd64-centos: centos9 centos9-clang centos9-dbg +amd64-centos: centos9 centos9-clang centos9-dbg centos10 centos10-clang centos10-dbg amd64-debian: debian12 debian12-clang debian12-dbg amd64-fedora: fedora40 fedora40-clang fedora40-dbg fedora41 fedora41-clang fedora41-dbg fedora42 fedora42-clang fedora42-dbg amd64-opensuse: opensuse15 opensuse15-clang opensuse15-dbg @@ -327,7 +327,7 @@ amd64-pkglist: arm64-%: SYS_ARCH := aarch64 arm64-packages: arm64-centos arm64-debian arm64-ubuntu arm64-fedora arm64-opensuse arm64-almalinux arm64-almalinux: almalinux8 almalinux9 -arm64-centos: centos9 +arm64-centos: centos9 centos10 arm64-debian: debian12 arm64-fedora: fedora40 fedora41 fedora42 arm64-opensuse: opensuse15 diff --git a/docker-compose.yml b/docker-compose.yml index 1f4b914ae..7affca457 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -47,6 +47,34 @@ services: - PKG_RELEASE=dbg-centos9 - PROXYSQL_BUILD_TYPE=debug +#################################################################################################### + centos10_build: + extends: + service: _build + image: proxysql/packaging:build-centos10-v3.0.2 + volumes: + - ./docker/images/proxysql/rhel-compliant/rpmmacros/rpmbuild/:/root/rpmbuild/ + - ./docker/images/proxysql/rhel-compliant/rpmmacros/.rpmmacros:/root/.rpmmacros + - ./docker/images/proxysql/rhel-compliant/entrypoint/:/opt/entrypoint/ + - ./:/opt/proxysql/ + environment: + - PKG_RELEASE=centos10 + - PROXYSQL_BUILD_TYPE=clickhouse + + centos10_clang_build: + extends: + service: centos10_build + image: proxysql/packaging:build-clang-centos10-v3.0.2 + environment: + - PKG_RELEASE=centos10-clang + + centos10_dbg_build: + extends: + service: centos10_build + environment: + - PKG_RELEASE=dbg-centos10 + - PROXYSQL_BUILD_TYPE=debug + #################################################################################################### #################################################################################################### fedora40_build: From 391584782423a1af4080ba01056b9ad9ba0b0289 Mon Sep 17 00:00:00 2001 From: Miro Stauder Date: Thu, 2 Oct 2025 09:49:09 +0000 Subject: [PATCH 4/5] add almalinux10 --- Makefile | 4 ++-- docker-compose.yml | 27 +++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 49bd99aab..7a4de6f7d 100644 --- a/Makefile +++ b/Makefile @@ -315,7 +315,7 @@ pkglist: $(REL_ARCH)-pkglist amd64-%: SYS_ARCH := x86_64 amd64-packages: amd64-centos amd64-ubuntu amd64-debian amd64-fedora amd64-opensuse amd64-almalinux -amd64-almalinux: almalinux8 almalinux8-clang almalinux8-dbg almalinux9 almalinux9-clang almalinux9-dbg +amd64-almalinux: almalinux8 almalinux8-clang almalinux8-dbg almalinux9 almalinux9-clang almalinux9-dbg almalinux10 almalinux10-clang almalinux10-dbg amd64-centos: centos9 centos9-clang centos9-dbg centos10 centos10-clang centos10-dbg amd64-debian: debian12 debian12-clang debian12-dbg amd64-fedora: fedora40 fedora40-clang fedora40-dbg fedora41 fedora41-clang fedora41-dbg fedora42 fedora42-clang fedora42-dbg @@ -326,7 +326,7 @@ amd64-pkglist: arm64-%: SYS_ARCH := aarch64 arm64-packages: arm64-centos arm64-debian arm64-ubuntu arm64-fedora arm64-opensuse arm64-almalinux -arm64-almalinux: almalinux8 almalinux9 +arm64-almalinux: almalinux8 almalinux9 almalinux10 arm64-centos: centos9 centos10 arm64-debian: debian12 arm64-fedora: fedora40 fedora41 fedora42 diff --git a/docker-compose.yml b/docker-compose.yml index 7affca457..028fa9fa6 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -329,6 +329,33 @@ services: - PKG_RELEASE=dbg-almalinux9 - PROXYSQL_BUILD_TYPE=debug +#################################################################################################### + almalinux10_build: + extends: + service: _build + image: proxysql/packaging:build-almalinux10-v3.0.2 + volumes: + - ./docker/images/proxysql/rhel-compliant/rpmmacros/rpmbuild/:/root/rpmbuild/ + - ./docker/images/proxysql/rhel-compliant/rpmmacros/.rpmmacros:/root/.rpmmacros + - ./docker/images/proxysql/rhel-compliant/entrypoint/:/opt/entrypoint/ + - ./:/opt/proxysql/ + environment: + - PKG_RELEASE=almalinux10 + - PROXYSQL_BUILD_TYPE=clickhouse + + almalinux10_clang_build: + extends: + service: almalinux10_build + image: proxysql/packaging:build-clang-almalinux10-v3.0.2 + environment: + - PKG_RELEASE=almalinux10-clang + + almalinux10_dbg_build: + extends: + service: almalinux10_build + environment: + - PKG_RELEASE=dbg-almalinux10 + - PROXYSQL_BUILD_TYPE=debug #################################################################################################### #################################################################################################### From 5931f801fa63f4f4ff02342a2faa400529a76ed6 Mon Sep 17 00:00:00 2001 From: Miro Stauder Date: Thu, 2 Oct 2025 19:26:47 +0000 Subject: [PATCH 5/5] update docker images to v3.0.3 --- docker-compose.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 028fa9fa6..9f6be097f 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -51,7 +51,7 @@ services: centos10_build: extends: service: _build - image: proxysql/packaging:build-centos10-v3.0.2 + image: proxysql/packaging:build-centos10-v3.0.3 volumes: - ./docker/images/proxysql/rhel-compliant/rpmmacros/rpmbuild/:/root/rpmbuild/ - ./docker/images/proxysql/rhel-compliant/rpmmacros/.rpmmacros:/root/.rpmmacros @@ -64,7 +64,7 @@ services: centos10_clang_build: extends: service: centos10_build - image: proxysql/packaging:build-clang-centos10-v3.0.2 + image: proxysql/packaging:build-clang-centos10-v3.0.3 environment: - PKG_RELEASE=centos10-clang @@ -333,7 +333,7 @@ services: almalinux10_build: extends: service: _build - image: proxysql/packaging:build-almalinux10-v3.0.2 + image: proxysql/packaging:build-almalinux10-v3.0.3 volumes: - ./docker/images/proxysql/rhel-compliant/rpmmacros/rpmbuild/:/root/rpmbuild/ - ./docker/images/proxysql/rhel-compliant/rpmmacros/.rpmmacros:/root/.rpmmacros @@ -346,7 +346,7 @@ services: almalinux10_clang_build: extends: service: almalinux10_build - image: proxysql/packaging:build-clang-almalinux10-v3.0.2 + image: proxysql/packaging:build-clang-almalinux10-v3.0.3 environment: - PKG_RELEASE=almalinux10-clang