From c7cad100cc85de9671a655cea7be02e8591f2d5a Mon Sep 17 00:00:00 2001 From: Nick Vyzas Date: Thu, 30 Apr 2020 19:32:50 +0300 Subject: [PATCH] 2.0.11 build changes and adding gnutls dep --- Makefile | 2 +- docker-compose.yml | 81 ------------------- .../proxysql/deb-compliant/ctl/proxysql.ctl | 5 +- .../latest-package/ctl/proxysql.ctl | 5 +- .../pre-systemd/ctl/proxysql.ctl | 5 +- .../rpmmacros/rpmbuild/SPECS/proxysql.spec | 2 +- .../rpmmacros/rpmbuild/SPECS/proxysql.spec | 2 +- 7 files changed, 12 insertions(+), 90 deletions(-) diff --git a/Makefile b/Makefile index b275a5d45..71fc52995 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ DEBUG=${ALL_DEBUG} #export OPTZ #export EXTRALINK export MAKE -export CURVER?=2.0.10 +export CURVER?=2.0.11 ifneq (,$(wildcard /etc/os-release)) DISTRO := $(shell gawk -F= '/^NAME/{print $$2}' /etc/os-release) else diff --git a/docker-compose.yml b/docker-compose.yml index b5a16e49b..d0a217efc 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,32 +1,5 @@ version: "2.0" services: - centos5_build: - image: proxysql/packaging:build-centos5 - volumes: - - ./docker/images/proxysql/rhel-compliant/rpmmacros/:/root/ - - ./docker/images/proxysql/rhel-compliant/entrypoint/:/opt/entrypoint/ - - ./:/opt/proxysql/ - environment: - - MAKE - - MAKEOPT - - CURVER - - PKG_RELEASE=centos5 - command: - - /opt/entrypoint/entrypoint.bash - centos5_dbg_build: - image: proxysql/packaging:build-centos5 - 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-centos5 - - PROXYSQL_BUILD_TYPE=debug - command: - - /opt/entrypoint/entrypoint.bash centos67_build: image: proxysql/packaging:build-centos6.7 volumes: @@ -261,33 +234,6 @@ services: - PROXYSQL_BUILD_TYPE=clickhouse command: - /opt/entrypoint/entrypoint.bash - debian7_build: - image: proxysql/packaging:build-debian7 - volumes: - - ./docker/images/proxysql/deb-compliant/pre-systemd/ctl/:/root/ctl/ - - ./docker/images/proxysql/deb-compliant/entrypoint/:/opt/entrypoint/ - - ./:/opt/proxysql/ - environment: - - MAKE - - MAKEOPT - - CURVER - - PKG_RELEASE=debian7 - command: - - /opt/entrypoint/entrypoint.bash - debian7_dbg_build: - image: proxysql/packaging:build-debian7 - volumes: - - ./docker/images/proxysql/deb-compliant/pre-systemd/ctl/:/root/ctl/ - - ./docker/images/proxysql/deb-compliant/entrypoint/:/opt/entrypoint/ - - ./:/opt/proxysql/ - environment: - - MAKE - - MAKEOPT - - CURVER - - PKG_RELEASE=dbg-debian7 - - PROXYSQL_BUILD_TYPE=debug - command: - - /opt/entrypoint/entrypoint.bash debian8_build: image: proxysql/packaging:build-debian8 volumes: @@ -438,33 +384,6 @@ services: - PROXYSQL_BUILD_TYPE=clickhouse command: - /opt/entrypoint/entrypoint.bash - ubuntu12_build: - image: proxysql/packaging:build-ubuntu12 - volumes: - - ./docker/images/proxysql/deb-compliant/pre-systemd/ctl/:/root/ctl/ - - ./docker/images/proxysql/deb-compliant/entrypoint/:/opt/entrypoint/ - - ./:/opt/proxysql/ - environment: - - MAKE - - MAKEOPT - - CURVER - - PKG_RELEASE=ubuntu12 - command: - - /opt/entrypoint/entrypoint.bash - ubuntu12_dbg_build: - image: proxysql/packaging:build-ubuntu12 - volumes: - - ./docker/images/proxysql/deb-compliant/pre-systemd/ctl/:/root/ctl/ - - ./docker/images/proxysql/deb-compliant/entrypoint/:/opt/entrypoint/ - - ./:/opt/proxysql/ - environment: - - MAKE - - MAKEOPT - - CURVER - - PKG_RELEASE=dbg-ubuntu12 - - PROXYSQL_BUILD_TYPE=debug - command: - - /opt/entrypoint/entrypoint.bash ubuntu14_build: image: proxysql/packaging:build-ubuntu14 volumes: diff --git a/docker/images/proxysql/deb-compliant/ctl/proxysql.ctl b/docker/images/proxysql/deb-compliant/ctl/proxysql.ctl index 3e4765797..5ad1d18ce 100644 --- a/docker/images/proxysql/deb-compliant/ctl/proxysql.ctl +++ b/docker/images/proxysql/deb-compliant/ctl/proxysql.ctl @@ -1,12 +1,13 @@ Section: misc Priority: optional -Homepage: http://www.proxysql.com +Homepage: https://proxysql.com Standards-Version: 3.9.2 Package: proxysql Version: PKG_VERSION_CURVER -Maintainer: Rene Cannao +Maintainer: ProxySQL LLC Architecture: amd64 +Depends: libgnutls28 # Changelog: CHANGELOG.md # Readme: README.md Files: proxysql /usr/bin/ diff --git a/docker/images/proxysql/deb-compliant/latest-package/ctl/proxysql.ctl b/docker/images/proxysql/deb-compliant/latest-package/ctl/proxysql.ctl index aa33787ad..f97a3f65b 100644 --- a/docker/images/proxysql/deb-compliant/latest-package/ctl/proxysql.ctl +++ b/docker/images/proxysql/deb-compliant/latest-package/ctl/proxysql.ctl @@ -1,12 +1,13 @@ Section: misc Priority: optional -Homepage: http://www.proxysql.com +Homepage: https://proxysql.com Standards-Version: 3.9.2 Package: proxysql Version: PKG_VERSION_CURVER -Maintainer: Rene Cannao +Maintainer: ProxySQL LLC Architecture: amd64 +Depends: libgnutls28 | libgnutls30 # Changelog: CHANGELOG.md # Readme: README.md Files: proxysql /usr/bin/ diff --git a/docker/images/proxysql/deb-compliant/pre-systemd/ctl/proxysql.ctl b/docker/images/proxysql/deb-compliant/pre-systemd/ctl/proxysql.ctl index 04b76dc28..52e5d8d4d 100644 --- a/docker/images/proxysql/deb-compliant/pre-systemd/ctl/proxysql.ctl +++ b/docker/images/proxysql/deb-compliant/pre-systemd/ctl/proxysql.ctl @@ -1,12 +1,13 @@ Section: misc Priority: optional -Homepage: http://www.proxysql.com +Homepage: https://proxysql.com Standards-Version: 3.9.2 Package: proxysql Version: PKG_VERSION_CURVER -Maintainer: Rene Cannao +Maintainer: ProxySQL LLC Architecture: amd64 +Depends: libgnutls28 # Changelog: CHANGELOG.md # Readme: README.md Files: proxysql /usr/bin/ diff --git a/docker/images/proxysql/rhel-compliant/rhel7/rpmmacros/rpmbuild/SPECS/proxysql.spec b/docker/images/proxysql/rhel-compliant/rhel7/rpmmacros/rpmbuild/SPECS/proxysql.spec index 4049b45df..d88696c32 100644 --- a/docker/images/proxysql/rhel-compliant/rhel7/rpmmacros/rpmbuild/SPECS/proxysql.spec +++ b/docker/images/proxysql/rhel-compliant/rhel7/rpmmacros/rpmbuild/SPECS/proxysql.spec @@ -10,7 +10,7 @@ License: GPL+ Group: Development/Tools SOURCE0 : %{name}-%{version}.tar.gz URL: http://www.proxysql.com/ - +Requires: gnutls BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root %description diff --git a/docker/images/proxysql/rhel-compliant/rpmmacros/rpmbuild/SPECS/proxysql.spec b/docker/images/proxysql/rhel-compliant/rpmmacros/rpmbuild/SPECS/proxysql.spec index 8432928c7..02ace66b5 100644 --- a/docker/images/proxysql/rhel-compliant/rpmmacros/rpmbuild/SPECS/proxysql.spec +++ b/docker/images/proxysql/rhel-compliant/rpmmacros/rpmbuild/SPECS/proxysql.spec @@ -13,7 +13,7 @@ License: GPL+ Group: Development/Tools SOURCE0 : %{name}-%{version}.tar.gz URL: http://www.proxysql.com/ - +Requires: gnutls BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root %description