From c0d5428f19e6b13fa2855f1c0ceb2dd4619f2fa5 Mon Sep 17 00:00:00 2001 From: Nick Vyzas Date: Thu, 30 Apr 2020 19:32:50 +0300 Subject: [PATCH] Port to 2.1.0: build changes and adding gnutls dep --- docker-compose.yml | 55 ++++++++++--------- .../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 +- 6 files changed, 39 insertions(+), 35 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 77368ea5e..6062c72c2 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: @@ -196,6 +169,20 @@ services: - PROXYSQL_BUILD_TYPE=debug command: - /opt/entrypoint/entrypoint.bash + fedora28_ch_build: + image: proxysql/packaging:build-fedora28 + volumes: + - ./docker/images/proxysql/rhel-compliant/rpmmacros/:/root/ + - ./docker/images/proxysql/rhel-compliant/entrypoint/:/opt/entrypoint/ + - ./:/opt/proxysql/ + environment: + - MAKE + - MAKEOPT + - CURVER + - PKG_RELEASE=clickhouse-fedora28 + - PROXYSQL_BUILD_TYPE=clickhouse + command: + - /opt/entrypoint/entrypoint.bash debian8_build: image: proxysql/packaging:build-debian8 volumes: @@ -307,6 +294,20 @@ services: - PROXYSQL_BUILD_TYPE=debug command: - /opt/entrypoint/entrypoint.bash + debian10_ch_build: + image: proxysql/packaging:build-debian10 + volumes: + - ./docker/images/proxysql/deb-compliant/latest-package/ctl/:/root/ctl/ + - ./docker/images/proxysql/deb-compliant/entrypoint/:/opt/entrypoint/ + - ./:/opt/proxysql/ + environment: + - MAKE + - MAKEOPT + - CURVER + - PKG_RELEASE=clickhouse-debian10 + - PROXYSQL_BUILD_TYPE=clickhouse + 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 824b79277..b0c7ef9db 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