From a6849afb6f3c6140faadcfae0ebb2094b48bbffa Mon Sep 17 00:00:00 2001 From: Miro Stauder Date: Mon, 10 Jan 2022 14:35:58 +0000 Subject: [PATCH] add centos6 target --- Makefile | 9 ++++++++- docker-compose.yml | 15 +++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f3ea7a610..5dd718241 100644 --- a/Makefile +++ b/Makefile @@ -181,7 +181,7 @@ clean: packages: amd64-packages arm64-packages .PHONY: packages -amd64-packages: centos6.7 centos6.7-dbg centos7 centos7-dbg centos8 centos8-dbg ubuntu14 ubuntu14-dbg ubuntu16 ubuntu16-dbg ubuntu18 ubuntu18-dbg ubuntu20 ubuntu20-dbg debian8 debian8-dbg debian9 debian9-dbg debian10 debian10-dbg debian11 debian11-dbg fedora24 fedora24-dbg fedora27 fedora27-dbg fedora28 fedora28-dbg fedora33 fedora33-dbg fedora34 fedora34-dbg +amd64-packages: centos6 centos6.7 centos6.7-dbg centos7 centos7-dbg centos8 centos8-dbg ubuntu14 ubuntu14-dbg ubuntu16 ubuntu16-dbg ubuntu18 ubuntu18-dbg ubuntu20 ubuntu20-dbg debian8 debian8-dbg debian9 debian9-dbg debian10 debian10-dbg debian11 debian11-dbg fedora24 fedora24-dbg fedora27 fedora27-dbg fedora28 fedora28-dbg fedora33 fedora33-dbg fedora34 fedora34-dbg .PHONY: amd64-packages arm64-packages: centos7-arm64 centos8-arm64 debian9-arm64 debian10-arm64 debian11-arm64 ubuntu18-arm64 ubuntu20-arm64 fedora32-arm64 fedora33-arm64 @@ -193,6 +193,9 @@ centos5: binaries/proxysql-${CURVER}-1-centos5.x86_64.rpm centos5-dbg: binaries/proxysql-${CURVER}-1-dbg-centos5.x86_64.rpm .PHONY: centos5-dbg +centos6: binaries/proxysql-${CURVER}-1-centos6.x86_64.rpm +.PHONY: centos6 + centos6.7: binaries/proxysql-${CURVER}-1-centos67.x86_64.rpm .PHONY: centos6.7 @@ -336,6 +339,10 @@ binaries/proxysql-${CURVER}-1-dbg-centos5.x86_64.rpm: docker-compose up centos5_dbg_build docker-compose rm -f +binaries/proxysql-${CURVER}-1-centos6.x86_64.rpm: + docker-compose up centos6_build + docker-compose rm -f + binaries/proxysql-${CURVER}-1-centos67.x86_64.rpm: docker-compose up centos67_build docker-compose rm -f diff --git a/docker-compose.yml b/docker-compose.yml index 717052673..f7491e30a 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,20 @@ version: "2.0" services: + centos6_build: + image: proxysql/packaging:build-centos6 + volumes: + - ./docker/images/proxysql/rhel-compliant/rpmmacros/:/root/ + - ./docker/images/proxysql/rhel-compliant/rhel6/entrypoint/:/opt/entrypoint/ + - ./:/opt/proxysql/ + environment: + - APPLY_PATCH=rhel6 + - MAKE + - MAKEOPT + - CURVER + - PKG_RELEASE=centos67 + - PROXYSQL_BUILD_ARCH=x86_64 + command: + - /opt/entrypoint/entrypoint.bash centos67_build: image: proxysql/packaging:build-centos6.7v2 volumes: