Merge pull request #4749 from sysown/v3.0-remove-obsolete-distros

V3.0 remove obsolete distros

Makefile

@@ -308,22 +308,22 @@ 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: centos8 centos8-clang centos8-dbg centos9 centos9-clang centos9-dbg
-amd64-debian: debian10 debian10-dbg debian11 debian11-clang debian11-dbg debian12 debian12-clang debian12-dbg
-amd64-fedora: fedora38 fedora38-clang fedora38-dbg fedora39 fedora39-clang fedora39-dbg fedora40 fedora40-clang fedora40-dbg fedora41 fedora41-clang fedora41-dbg
+amd64-centos: centos9 centos9-clang centos9-dbg
+amd64-debian: debian12 debian12-clang debian12-dbg
+amd64-fedora: fedora40 fedora40-clang fedora40-dbg fedora41 fedora41-clang fedora41-dbg
 amd64-opensuse: opensuse15 opensuse15-clang opensuse15-dbg
-amd64-ubuntu: ubuntu18 ubuntu18-dbg ubuntu20 ubuntu20-clang ubuntu20-dbg ubuntu22 ubuntu22-clang ubuntu22-dbg ubuntu24 ubuntu24-clang ubuntu24-dbg
+amd64-ubuntu: ubuntu22 ubuntu22-clang ubuntu22-dbg ubuntu24 ubuntu24-clang ubuntu24-dbg
 amd64-pkglist:
 	@make -nk amd64-packages 2>/dev/null | grep -Po '(?<=binaries/)proxysql\S+$$'
 
 arm64-%: SYS_ARCH := aarch64
 arm64-packages: arm64-centos arm64-debian arm64-ubuntu arm64-fedora arm64-opensuse arm64-almalinux
 arm64-almalinux: almalinux8 almalinux9
-arm64-centos: centos8 centos9
-arm64-debian: debian10 debian11 debian12
-arm64-fedora: fedora38 fedora39 fedora40 fedora41
+arm64-centos: centos9
+arm64-debian: debian12
+arm64-fedora: fedora40 fedora41
 arm64-opensuse: opensuse15
-arm64-ubuntu: ubuntu18 ubuntu20 ubuntu22 ubuntu24
+arm64-ubuntu: ubuntu22 ubuntu24
 arm64-pkglist:
 	@make -nk arm64-packages 2>/dev/null | grep -Po '(?<=binaries/)proxysql\S+$$'
 

deps/Makefile

@@ -145,7 +145,7 @@ microhttpd: libmicrohttpd/libmicrohttpd/src/microhttpd/.libs/libmicrohttpd.a
 
 cityhash/cityhash/src/.libs/libcityhash.a:
 	cd cityhash && rm -rf cityhash-*/ || true
-	cd cityhash && tar -zxf cityhash-*.tar.gz && sync
+	cd cityhash && tar -zxf cityhash-*.tar.gz
 	cd cityhash/cityhash && cp ../config.guess . && chmod +x config.guess && cp ../config.sub . && chmod +x config.sub
 	cd cityhash/cityhash && ./configure && CC=${CC} CXX=${CXX} ${MAKE}
 
@@ -162,7 +162,7 @@ lz4: lz4/lz4/lib/liblz4.a
 
 clickhouse-cpp/clickhouse-cpp/clickhouse/libclickhouse-cpp-lib-static.a:
 	cd clickhouse-cpp && rm -rf clickhouse-cpp-*/ || true
-	cd clickhouse-cpp && tar -zxf v2.3.0.tar.gz && sync
+	cd clickhouse-cpp && tar -zxf v2.3.0.tar.gz
 	cd clickhouse-cpp && ln -fs clickhouse-cpp-*/ clickhouse-cpp
 	cd clickhouse-cpp/clickhouse-cpp && patch clickhouse/base/wire_format.h < ../wire_format.patch
 	cd clickhouse-cpp/clickhouse-cpp && cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo .

docker-compose.yml

@@ -1,4 +1,3 @@
-#version: "3.0"
 services:
 
 ####################################################################################################
@@ -16,35 +15,6 @@ services:
     command: bash -l -c /opt/entrypoint/entrypoint.bash
 
 ####################################################################################################
-####################################################################################################
-  centos8_build:
-    extends:
-      service: _build
-    image: proxysql/packaging:build-centos8-v3.0.0
-    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=centos8
-      - PROXYSQL_BUILD_TYPE=clickhouse
-
-  centos8_clang_build:
-    extends:
-      service: centos8_build
-    image: proxysql/packaging:build-clang-centos8-v3.0.0
-    environment:
-      - PKG_RELEASE=centos8-clang
-
-  centos8_dbg_build:
-    extends:
-      service: centos8_build
-    environment:
-      - PKG_RELEASE=dbg-centos8
-      - PROXYSQL_BUILD_TYPE=debug
-
-
 ####################################################################################################
   centos9_build:
     extends:
@@ -74,62 +44,6 @@ services:
       - PROXYSQL_BUILD_TYPE=debug
 
 ####################################################################################################
-####################################################################################################
-  fedora38_build:
-    extends:
-      service: _build
-    image: proxysql/packaging:build-fedora38-v3.0.0
-    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=fedora38
-      - PROXYSQL_BUILD_TYPE=clickhouse
-
-  fedora38_clang_build:
-    extends:
-      service: fedora38_build
-    image: proxysql/packaging:build-clang-fedora38-v3.0.0
-    environment:
-      - PKG_RELEASE=fedora38-clang
-
-  fedora38_dbg_build:
-    extends:
-      service: fedora38_build
-    environment:
-      - PKG_RELEASE=dbg-fedora38
-      - PROXYSQL_BUILD_TYPE=debug
-
-####################################################################################################
-  fedora39_build:
-    extends:
-      service: _build
-    image: proxysql/packaging:build-fedora39-v3.0.0
-    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=fedora39
-      - PROXYSQL_BUILD_TYPE=clickhouse
-
-  fedora39_clang_build:
-    extends:
-      service: fedora39_build
-    image: proxysql/packaging:build-clang-fedora39-v3.0.0
-    environment:
-      - PKG_RELEASE=fedora39-clang
-
-  fedora39_dbg_build:
-    extends:
-      service: fedora39_build
-    environment:
-      - PKG_RELEASE=dbg-fedora39
-      - PROXYSQL_BUILD_TYPE=debug
-
 ####################################################################################################
   fedora40_build:
     extends:
@@ -162,7 +76,7 @@ services:
   fedora41_build:
     extends:
       service: _build
-    image: proxysql/packaging:build-fedora41-v2.7.1
+    image: proxysql/packaging:build-fedora41-v3.0.0
     volumes:
       - ./docker/images/proxysql/rhel-compliant/rpmmacros/rpmbuild/:/root/rpmbuild/
       - ./docker/images/proxysql/rhel-compliant/rpmmacros/.rpmmacros:/root/.rpmmacros
@@ -175,7 +89,7 @@ services:
   fedora41_clang_build:
     extends:
       service: fedora41_build
-    image: proxysql/packaging:build-clang-fedora41-v2.7.1
+    image: proxysql/packaging:build-clang-fedora41-v3.0.0
     environment:
       - PKG_RELEASE=fedora41-clang
 
@@ -187,60 +101,13 @@ services:
       - PROXYSQL_BUILD_TYPE=debug
 
 ####################################################################################################
-####################################################################################################
-  debian10_build:
-    extends:
-      service: _build
-    image: proxysql/packaging:build-debian10-v3.0.0
-    volumes:
-      - ./docker/images/proxysql/deb-compliant/latest-package/ctl/:/root/ctl/
-      - ./docker/images/proxysql/deb-compliant/entrypoint/:/opt/entrypoint/
-      - ./:/opt/proxysql/
-    environment:
-      - PKG_RELEASE=debian10
-      - PROXYSQL_BUILD_TYPE=clickhouse
-
-  debian10_dbg_build:
-    extends:
-      service: debian10_build
-    environment:
-      - PKG_RELEASE=dbg-debian10
-      - PROXYSQL_BUILD_TYPE=debug
-
-####################################################################################################
-  debian11_build:
-    extends:
-      service: _build
-    image: proxysql/packaging:build-debian11-v3.0.0
-    volumes:
-      - ./docker/images/proxysql/deb-compliant/latest-package/ctl/:/root/ctl/
-      - ./docker/images/proxysql/deb-compliant/entrypoint/:/opt/entrypoint/
-      - ./:/opt/proxysql/
-    environment:
-      - PKG_RELEASE=debian11
-      - PROXYSQL_BUILD_TYPE=clickhouse
-
-  debian11_clang_build:
-    extends:
-      service: debian11_build
-    image: proxysql/packaging:build-clang-debian11-v3.0.0
-    environment:
-      - PKG_RELEASE=debian11-clang
-
-  debian11_dbg_build:
-    extends:
-      service: debian11_build
-    environment:
-      - PKG_RELEASE=dbg-debian11
-      - PROXYSQL_BUILD_TYPE=debug
-
 ####################################################################################################
   debian12_build:
     extends:
       service: _build
     image: proxysql/packaging:build-debian12-v3.0.0
     volumes:
-      - ./docker/images/proxysql/deb-compliant/latest-package/ctl/:/root/ctl/
+      - ./docker/images/proxysql/deb-compliant/ctl/:/root/ctl/
       - ./docker/images/proxysql/deb-compliant/entrypoint/:/opt/entrypoint/
       - ./:/opt/proxysql/
     environment:
@@ -262,60 +129,13 @@ services:
       - PROXYSQL_BUILD_TYPE=debug
 
 ####################################################################################################
-####################################################################################################
-  ubuntu18_build:
-    extends:
-      service: _build
-    image: proxysql/packaging:build-ubuntu18-v3.0.0
-    volumes:
-      - ./docker/images/proxysql/deb-compliant/latest-package/ctl/:/root/ctl/
-      - ./docker/images/proxysql/deb-compliant/entrypoint/:/opt/entrypoint/
-      - ./:/opt/proxysql/
-    environment:
-      - PKG_RELEASE=ubuntu18
-      - PROXYSQL_BUILD_TYPE=clickhouse
-
-  ubuntu18_dbg_build:
-    extends:
-      service: ubuntu18_build
-    environment:
-      - PKG_RELEASE=dbg-ubuntu18
-      - PROXYSQL_BUILD_TYPE=debug
-
-####################################################################################################
-  ubuntu20_build:
-    extends:
-      service: _build
-    image: proxysql/packaging:build-ubuntu20-v3.0.0
-    volumes:
-      - ./docker/images/proxysql/deb-compliant/latest-package/ctl/:/root/ctl/
-      - ./docker/images/proxysql/deb-compliant/entrypoint/:/opt/entrypoint/
-      - ./:/opt/proxysql/
-    environment:
-      - PKG_RELEASE=ubuntu20
-      - PROXYSQL_BUILD_TYPE=clickhouse
-
-  ubuntu20_clang_build:
-    extends:
-      service: ubuntu20_build
-    image: proxysql/packaging:build-clang-ubuntu20-v3.0.0
-    environment:
-      - PKG_RELEASE=ubuntu20-clang
-
-  ubuntu20_dbg_build:
-    extends:
-      service: ubuntu20_build
-    environment:
-      - PKG_RELEASE=dbg-ubuntu20
-      - PROXYSQL_BUILD_TYPE=debug
-
 ####################################################################################################
   ubuntu22_build:
     extends:
       service: _build
     image: proxysql/packaging:build-ubuntu22-v3.0.0
     volumes:
-      - ./docker/images/proxysql/deb-compliant/latest-package/ctl/:/root/ctl/
+      - ./docker/images/proxysql/deb-compliant/ctl/:/root/ctl/
       - ./docker/images/proxysql/deb-compliant/entrypoint/:/opt/entrypoint/
       - ./:/opt/proxysql/
     environment:
@@ -342,7 +162,7 @@ services:
       service: _build
     image: proxysql/packaging:build-ubuntu24-v3.0.0
     volumes:
-      - ./docker/images/proxysql/deb-compliant/latest-package/ctl/:/root/ctl/
+      - ./docker/images/proxysql/deb-compliant/ctl/:/root/ctl/
       - ./docker/images/proxysql/deb-compliant/entrypoint/:/opt/entrypoint/
       - ./:/opt/proxysql/
     environment:

docker/images/proxysql/deb-compliant/ctl/proxysql.ctl

@@ -8,20 +8,20 @@ Version: PKG_VERSION_CURVER
 Maintainer: ProxySQL LLC <[email protected]>
 Copyright: copyright
 Architecture: PKG_ARCH
-Depends: libgnutls28 | libgnutls-deb0-28 | libgnutls30
+Depends: libgnutls28 | libgnutls30, libssl (>= 3.0.0) | libssl3 (>= 3.0.0)
 # Changelog: CHANGELOG.md
 # Readme: README.md
 Files: proxysql /usr/bin/
- etc/proxysql.cnf /
+ etc/proxysql.cnf /etc/
  etc/logrotate.d/proxysql /etc/logrotate.d/
- systemd/system/proxysql-initial.service /lib/
- systemd/system/proxysql.service /lib/
- tools/proxysql_galera_checker.sh /usr/share/proxysql/
- tools/proxysql_galera_writer.pl /usr/share/proxysql/
-Description: High performance MySQL proxy
- ProxySQL is a fast, reliable MySQL proxy with advanced runtime configuration management (virtually no configuration change requires a restart). 
+ systemd/system/proxysql-initial.service /lib/systemd/system/
+ systemd/system/proxysql.service /lib/systemd/system/
+ tools/proxysql_galera_checker.sh /usr/share/proxysql/tools/
+ tools/proxysql_galera_writer.pl /usr/share/proxysql/tools/
+Description: High performance MySQL and PostgreSQL proxy
+ ProxySQL is a fast, reliable MySQL and PostgreSQL proxy with advanced runtime configuration management (virtually no configuration change requires a restart). 
  .
- It features query routing, query caching, query rewriting (for queries generated by ORMs, for example) and is most of the time a drop-in replacement for mysqld from the point of view of the application. It can be configured and remote controlled through an SQL-compatible admin interface.
+ It features query routing, query caching, query rewriting (for queries generated by ORMs, for example) and is most of the time a drop-in replacement for mysqld and postgres from the point of view of the application. It can be configured and remote controlled through an SQL-compatible admin interface.
 File: postinst
  #!/bin/sh -e
  if [ ! -d /var/lib/proxysql ]; then mkdir /var/lib/proxysql ; fi