Merge pull request #4440 from sysown/v2.6.0-4437-deprecate-old-distros

remove deprecated distros
sysown · Jan 25, 2024 · 3ee73f8 · 3ee73f8
2 parents 647dbd2 + 5c14433
commit 3ee73f8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 249 deletions.
diff --git a/Makefile b/Makefile
@@ -303,17 +303,17 @@ ubuntu: $(REL_ARCH)-ubuntu ;
 
 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: centos6 centos6-dbg centos7 centos7-dbg centos8 centos8-clang centos8-dbg centos9 centos9-clang centos9-dbg
-amd64-debian: debian8 debian8-dbg debian9 debian9-dbg debian10 debian10-dbg debian11 debian11-clang debian11-dbg debian12 debian12-clang debian12-dbg
-amd64-fedora: fedora27 fedora27-dbg fedora28 fedora28-dbg fedora33 fedora33-dbg fedora34 fedora34-clang fedora34-dbg fedora36 fedora36-clang fedora36-dbg fedora37 fedora37-clang fedora37-dbg fedora38 fedora38-clang fedora38-dbg fedora39 fedora39-clang fedora39-dbg
+amd64-centos: centos7 centos7-dbg 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
 amd64-opensuse: opensuse15 opensuse15-clang opensuse15-dbg
-amd64-ubuntu: ubuntu14 ubuntu14-dbg ubuntu16 ubuntu16-dbg ubuntu18 ubuntu18-dbg ubuntu20 ubuntu20-clang ubuntu20-dbg ubuntu22 ubuntu22-clang ubuntu22-dbg
+amd64-ubuntu: ubuntu16 ubuntu16-dbg ubuntu18 ubuntu18-dbg ubuntu20 ubuntu20-clang ubuntu20-dbg ubuntu22 ubuntu22-clang ubuntu22-dbg
 
 arm64-packages: arm64-centos arm64-debian arm64-ubuntu arm64-fedora arm64-opensuse arm64-almalinux
 arm64-almalinux: almalinux8 almalinux9
 arm64-centos: centos7 centos8
-arm64-debian: debian9 debian10 debian11 debian12
-arm64-fedora: fedora33 fedora34 fedora36 fedora37 fedora38 fedora39
+arm64-debian: debian10 debian11 debian12
+arm64-fedora: fedora38 fedora39
 arm64-opensuse: opensuse15
 arm64-ubuntu: ubuntu16 ubuntu18 ubuntu20 ubuntu22
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -15,26 +15,6 @@ services:
     command: bash -l -c /opt/entrypoint/entrypoint.bash
 
 ####################################################################################################
-####################################################################################################
-  centos6_build:
-    extends:
-      service: _build
-    image: proxysql/packaging:build-centos6
-    volumes:
-      - ./docker/images/proxysql/rhel-compliant/rhel6/rpmmacros/rpmbuild/:/root/rpmbuild/
-      - ./docker/images/proxysql/rhel-compliant/rhel6/rpmmacros/.rpmmacros:/root/.rpmmacros
-      - ./docker/images/proxysql/rhel-compliant/rhel6/entrypoint/:/opt/entrypoint/
-      - ./:/opt/proxysql/
-    environment:
-      - PKG_RELEASE=centos6
-
-  centos6_dbg_build:
-    extends:
-      service: centos6_build
-    environment:
-      - PKG_RELEASE=dbg-centos6
-      - PROXYSQL_BUILD_TYPE=debug
-
 ####################################################################################################
   centos7_build:
     extends:
@@ -75,7 +55,6 @@ services:
     image: proxysql/packaging:build-clang-centos8
     environment:
       - PKG_RELEASE=centos8-clang
-      - PROXYSQL_BUILD_TYPE=
 
   centos8_dbg_build:
     extends:
@@ -105,7 +84,6 @@ services:
     image: proxysql/packaging:build-clang-centos9
     environment:
       - PKG_RELEASE=centos9-clang
-      - PROXYSQL_BUILD_TYPE=
 
   centos9_dbg_build:
     extends:
@@ -114,159 +92,7 @@ services:
       - PKG_RELEASE=dbg-centos9
       - PROXYSQL_BUILD_TYPE=debug
 
-
-####################################################################################################
-####################################################################################################
-  fedora27_build:
-    extends:
-      service: _build
-    image: proxysql/packaging:build-fedora27
-    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=fedora27
-      - PROXYSQL_BUILD_TYPE=clickhouse
-
-  fedora27_dbg_build:
-    extends:
-      service: fedora27_build
-    environment:
-      - PKG_RELEASE=dbg-fedora27
-      - PROXYSQL_BUILD_TYPE=debug
-
-####################################################################################################
-  fedora28_build:
-    extends:
-      service: _build
-    image: proxysql/packaging:build-fedora28
-    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=fedora28
-      - PROXYSQL_BUILD_TYPE=clickhouse
-
-  fedora28_dbg_build:
-    extends:
-      service: fedora28_build
-    environment:
-      - PKG_RELEASE=dbg-fedora28
-      - PROXYSQL_BUILD_TYPE=debug
-
-####################################################################################################
-  fedora33_build:
-    extends:
-      service: _build
-    image: proxysql/packaging:build-fedora33
-    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=fedora33
-      - PROXYSQL_BUILD_TYPE=clickhouse
-
-  fedora33_dbg_build:
-    extends:
-      service: fedora33_build
-    environment:
-      - PKG_RELEASE=dbg-fedora33
-      - PROXYSQL_BUILD_TYPE=debug
-
-####################################################################################################
-  fedora34_build:
-    extends:
-      service: _build
-    image: proxysql/packaging:build-fedora34
-    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=fedora34
-      - PROXYSQL_BUILD_TYPE=clickhouse
-
-  fedora34_clang_build:
-    extends:
-      service: fedora34_build
-    image: proxysql/packaging:build-clang-fedora34
-    environment:
-      - PKG_RELEASE=fedora34-clang
-      - PROXYSQL_BUILD_TYPE=
-
-  fedora34_dbg_build:
-    image: proxysql/packaging:build-fedora34
-    extends:
-      service: fedora34_build
-    environment:
-      - PKG_RELEASE=dbg-fedora34
-      - PROXYSQL_BUILD_TYPE=debug
-
-####################################################################################################
-  fedora36_build:
-    extends:
-      service: _build
-    image: proxysql/packaging:build-fedora36
-    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=fedora36
-      - PROXYSQL_BUILD_TYPE=clickhouse
-
-  fedora36_clang_build:
-    extends:
-      service: fedora36_build
-    image: proxysql/packaging:build-clang-fedora36
-    environment:
-      - PKG_RELEASE=fedora36-clang
-      - PROXYSQL_BUILD_TYPE=clickhouse
-
-  fedora36_dbg_build:
-    extends:
-      service: fedora36_build
-    environment:
-      - PKG_RELEASE=dbg-fedora36
-      - PROXYSQL_BUILD_TYPE=debug
-
 ####################################################################################################
-  fedora37_build:
-    extends:
-      service: _build
-    image: proxysql/packaging:build-fedora37
-    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=fedora37
-      - PROXYSQL_BUILD_TYPE=clickhouse
-
-  fedora37_clang_build:
-    extends:
-      service: fedora37_build
-    image: proxysql/packaging:build-clang-fedora37
-    environment:
-      - PKG_RELEASE=fedora37-clang
-      - PROXYSQL_BUILD_TYPE=clickhouse
-
-  fedora37_dbg_build:
-    extends:
-      service: fedora37_build
-    environment:
-      - PKG_RELEASE=dbg-fedora37
-      - PROXYSQL_BUILD_TYPE=debug
-
 ####################################################################################################
   fedora38_build:
     extends:
@@ -287,7 +113,6 @@ services:
     image: proxysql/packaging:build-clang-fedora38
     environment:
       - PKG_RELEASE=fedora38-clang
-      - PROXYSQL_BUILD_TYPE=clickhouse
 
   fedora38_dbg_build:
     extends:
@@ -316,7 +141,6 @@ services:
     image: proxysql/packaging:build-clang-fedora39
     environment:
       - PKG_RELEASE=fedora39-clang
-      - PROXYSQL_BUILD_TYPE=clickhouse
 
   fedora39_dbg_build:
     extends:
@@ -326,44 +150,6 @@ services:
       - PROXYSQL_BUILD_TYPE=debug
 
 ####################################################################################################
-####################################################################################################
-  debian8_build:
-    extends:
-      service: _build
-    image: proxysql/packaging:build-debian8
-    volumes:
-      - ./docker/images/proxysql/deb-compliant/pre-systemd/ctl/:/root/ctl/
-      - ./docker/images/proxysql/deb-compliant/entrypoint/:/opt/entrypoint/
-      - ./:/opt/proxysql/
-    environment:
-      - PKG_RELEASE=debian8
-
-  debian8_dbg_build:
-    extends:
-      service: debian8_build
-    environment:
-      - PKG_RELEASE=dbg-debian8
-      - PROXYSQL_BUILD_TYPE=debug
-
-####################################################################################################
-  debian9_build:
-    extends:
-      service: _build
-    image: proxysql/packaging:build-debian9
-    volumes:
-      - ./docker/images/proxysql/deb-compliant/ctl/:/root/ctl/
-      - ./docker/images/proxysql/deb-compliant/entrypoint/:/opt/entrypoint/
-      - ./:/opt/proxysql/
-    environment:
-      - PKG_RELEASE=debian9
-
-  debian9_dbg_build:
-    extends:
-      service: debian9_build
-    environment:
-      - PKG_RELEASE=dbg-debian9
-      - PROXYSQL_BUILD_TYPE=debug
-
 ####################################################################################################
   debian10_build:
     extends:
@@ -403,7 +189,6 @@ services:
     image: proxysql/packaging:build-clang-debian11
     environment:
       - PKG_RELEASE=debian11-clang
-      - PROXYSQL_BUILD_TYPE=
 
   debian11_dbg_build:
     extends:
@@ -431,7 +216,6 @@ services:
     image: proxysql/packaging:build-clang-debian12
     environment:
       - PKG_RELEASE=debian12-clang
-      - PROXYSQL_BUILD_TYPE=clickhouse
 
   debian12_dbg_build:
     extends:
@@ -440,27 +224,7 @@ services:
       - PKG_RELEASE=dbg-debian12
       - PROXYSQL_BUILD_TYPE=debug
 
-
 ####################################################################################################
-####################################################################################################
-  ubuntu14_build:
-    extends:
-      service: _build
-    image: proxysql/packaging:build-ubuntu14
-    volumes:
-      - ./docker/images/proxysql/deb-compliant/pre-systemd/ctl/:/root/ctl/
-      - ./docker/images/proxysql/deb-compliant/entrypoint/:/opt/entrypoint/
-      - ./:/opt/proxysql/
-    environment:
-      - PKG_RELEASE=ubuntu14
-
-  ubuntu14_dbg_build:
-    extends:
-      service: ubuntu14_build
-    environment:
-      - PKG_RELEASE=dbg-ubuntu14
-      - PROXYSQL_BUILD_TYPE=debug
-
 ####################################################################################################
   ubuntu16_build:
     extends:
@@ -519,7 +283,6 @@ services:
     image: proxysql/packaging:build-clang-ubuntu20
     environment:
       - PKG_RELEASE=ubuntu20-clang
-      - PROXYSQL_BUILD_TYPE=
 
   ubuntu20_dbg_build:
     extends:
@@ -547,7 +310,6 @@ services:
     image: proxysql/packaging:build-clang-ubuntu22
     environment:
       - PKG_RELEASE=ubuntu22-clang
-      - PROXYSQL_BUILD_TYPE=clickhouse
 
   ubuntu22_dbg_build:
     extends:
@@ -556,7 +318,6 @@ services:
       - PKG_RELEASE=dbg-ubuntu22
       - PROXYSQL_BUILD_TYPE=debug
 
-
 ####################################################################################################
 ####################################################################################################
   opensuse15_build:
@@ -578,7 +339,6 @@ services:
     image: proxysql/packaging:build-clang-opensuse15
     environment:
       - PKG_RELEASE=opensuse15-clang
-      - PROXYSQL_BUILD_TYPE=
 
   opensuse15_dbg_build:
     extends:
@@ -587,7 +347,6 @@ services:
       - PKG_RELEASE=dbg-opensuse15
       - PROXYSQL_BUILD_TYPE=debug
 
-
 ####################################################################################################
 ####################################################################################################
   almalinux8_build:
@@ -609,7 +368,6 @@ services:
     image: proxysql/packaging:build-clang-almalinux8
     environment:
       - PKG_RELEASE=almalinux8-clang
-      - PROXYSQL_BUILD_TYPE=
 
   almalinux8_dbg_build:
     extends:
@@ -638,7 +396,6 @@ services:
     image: proxysql/packaging:build-clang-almalinux9
     environment:
       - PKG_RELEASE=almalinux9-clang
-      - PROXYSQL_BUILD_TYPE=
 
   almalinux9_dbg_build:
     extends: