From 2b280da402c5624f18ba756291dbae733cdffc17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Canna=C3=B2?= Date: Sun, 29 Apr 2018 10:58:03 +0200 Subject: [PATCH] Updating docker files to 2.0.0 --- Makefile | 10 +-- .../proxysql/debian-7.8-build/proxysql.ctl | 2 +- .../proxysql/debian-8.2-build/proxysql.ctl | 2 +- .../proxysql/debian-9-build/proxysql.ctl | 2 +- .../proxysql/debian-9.4-build/proxysql.ctl | 24 ++++++ .../proxysql/fedora27-build/proxysql.spec | 76 +++++++++++++++++++ .../images/proxysql/fedora27-build/rpmmacros | 2 + .../proxysql/ubuntu-12.04-build/proxysql.ctl | 2 +- .../proxysql/ubuntu-14.04-build/proxysql.ctl | 2 +- .../proxysql/ubuntu-16.04-build/proxysql.ctl | 2 +- 10 files changed, 113 insertions(+), 11 deletions(-) create mode 100644 docker/images/proxysql/debian-9.4-build/proxysql.ctl create mode 100644 docker/images/proxysql/fedora27-build/proxysql.spec create mode 100644 docker/images/proxysql/fedora27-build/rpmmacros diff --git a/Makefile b/Makefile index 58ec2bc7c..c20c5d214 100644 --- a/Makefile +++ b/Makefile @@ -731,7 +731,7 @@ binaries/proxysql_${CURVER}-dbg-debian8_amd64.deb: binaries/proxysql_${CURVER}-dbg-debian9_amd64.deb: docker stop debian9_build || true docker rm debian9_build || true - docker create --name debian9_build renecannao/proxysql:build-debian8 bash -c "while : ; do sleep 10 ; done" + docker create --name debian9_build renecannao/proxysql:build-debian9 bash -c "while : ; do sleep 10 ; done" docker start debian9_build docker exec debian9_build bash -c "cd /opt; git clone -b v${CURVER} https://github.com/sysown/proxysql.git proxysql" sleep 2 @@ -754,7 +754,7 @@ binaries/proxysql_${CURVER}-debian9.4_amd64.deb: sleep 2 docker exec debian9.4_build bash -c "cd /opt/proxysql; ${MAKE} clean && ${MAKE} ${MAKEOPT} build_deps && ${MAKE} ${MAKEOPT}" sleep 2 - docker cp docker/images/proxysql/debian-9-build/proxysql.ctl debian9.4_build:/opt/proxysql/ + docker cp docker/images/proxysql/debian-9.4-build/proxysql.ctl debian9.4_build:/opt/proxysql/ sleep 2 docker exec debian9.4_build bash -c "cd /opt/proxysql; cp src/proxysql . ; equivs-build proxysql.ctl" sleep 2 @@ -765,13 +765,13 @@ binaries/proxysql_${CURVER}-debian9.4_amd64.deb: binaries/proxysql_${CURVER}-dbg-debian9.4_amd64.deb: docker stop debian9.4_build || true docker rm debian9.4_build || true - docker create --name debian9.4_build renecannao/proxysql:build-debian8 bash -c "while : ; do sleep 10 ; done" + docker create --name debian9.4_build renecannao/proxysql:build-debian9.4 bash -c "while : ; do sleep 10 ; done" docker start debian9.4_build docker exec debian9.4_build bash -c "cd /opt; git clone -b v${CURVER} https://github.com/sysown/proxysql.git proxysql" sleep 2 docker exec debian9.4_build bash -c "cd /opt/proxysql; ${MAKE} clean && ${MAKE} ${MAKEOPT} build_deps && ${MAKE} ${MAKEOPT} debug" sleep 2 - docker cp docker/images/proxysql/debian-9-build/proxysql.ctl debian9.4_build:/opt/proxysql/ + docker cp docker/images/proxysql/debian-9.4-build/proxysql.ctl debian9.4_build:/opt/proxysql/ sleep 2 docker exec debian9.4_build bash -c "cd /opt/proxysql; cp src/proxysql . ; equivs-build proxysql.ctl" sleep 2 @@ -788,7 +788,7 @@ binaries/proxysql_${CURVER}-clickhouse-debian9.4_amd64.deb: sleep 2 docker exec debian9.4_build bash -c "cd /opt/proxysql; ${MAKE} clean && ${MAKE} ${MAKEOPT} build_deps_clickhouse && ${MAKE} clickhouse ${MAKEOPT}" sleep 2 - docker cp docker/images/proxysql/debian-9-build/proxysql.ctl debian9.4_build:/opt/proxysql/ + docker cp docker/images/proxysql/debian-9.4-build/proxysql.ctl debian9.4_build:/opt/proxysql/ sleep 2 docker exec debian9.4_build bash -c "cd /opt/proxysql; cp src/proxysql . ; equivs-build proxysql.ctl" sleep 2 diff --git a/docker/images/proxysql/debian-7.8-build/proxysql.ctl b/docker/images/proxysql/debian-7.8-build/proxysql.ctl index a59f0e03b..e04fbf2b3 100644 --- a/docker/images/proxysql/debian-7.8-build/proxysql.ctl +++ b/docker/images/proxysql/debian-7.8-build/proxysql.ctl @@ -4,7 +4,7 @@ Homepage: http://www.proxysql.com Standards-Version: 3.9.2 Package: proxysql -Version: 1.4.7 +Version: 2.0.0 Maintainer: Rene Cannao Architecture: amd64 # Changelog: CHANGELOG.md diff --git a/docker/images/proxysql/debian-8.2-build/proxysql.ctl b/docker/images/proxysql/debian-8.2-build/proxysql.ctl index a59f0e03b..e04fbf2b3 100644 --- a/docker/images/proxysql/debian-8.2-build/proxysql.ctl +++ b/docker/images/proxysql/debian-8.2-build/proxysql.ctl @@ -4,7 +4,7 @@ Homepage: http://www.proxysql.com Standards-Version: 3.9.2 Package: proxysql -Version: 1.4.7 +Version: 2.0.0 Maintainer: Rene Cannao Architecture: amd64 # Changelog: CHANGELOG.md diff --git a/docker/images/proxysql/debian-9-build/proxysql.ctl b/docker/images/proxysql/debian-9-build/proxysql.ctl index a59f0e03b..e04fbf2b3 100644 --- a/docker/images/proxysql/debian-9-build/proxysql.ctl +++ b/docker/images/proxysql/debian-9-build/proxysql.ctl @@ -4,7 +4,7 @@ Homepage: http://www.proxysql.com Standards-Version: 3.9.2 Package: proxysql -Version: 1.4.7 +Version: 2.0.0 Maintainer: Rene Cannao Architecture: amd64 # Changelog: CHANGELOG.md diff --git a/docker/images/proxysql/debian-9.4-build/proxysql.ctl b/docker/images/proxysql/debian-9.4-build/proxysql.ctl new file mode 100644 index 000000000..e04fbf2b3 --- /dev/null +++ b/docker/images/proxysql/debian-9.4-build/proxysql.ctl @@ -0,0 +1,24 @@ +Section: misc +Priority: optional +Homepage: http://www.proxysql.com +Standards-Version: 3.9.2 + +Package: proxysql +Version: 2.0.0 +Maintainer: Rene Cannao +Architecture: amd64 +# Changelog: CHANGELOG.md +# Readme: README.md +Files: proxysql /usr/bin/ + etc/proxysql.cnf / + etc/init.d/proxysql / + 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). + . + 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. +File: postinst + #!/bin/sh -e + if [ ! -d /var/lib/proxysql ]; then mkdir /var/lib/proxysql ; fi + update-rc.d proxysql defaults diff --git a/docker/images/proxysql/fedora27-build/proxysql.spec b/docker/images/proxysql/fedora27-build/proxysql.spec new file mode 100644 index 000000000..16ff2cff5 --- /dev/null +++ b/docker/images/proxysql/fedora27-build/proxysql.spec @@ -0,0 +1,76 @@ +# Don't try fancy stuff like debuginfo, which is useless on binary-only +# packages. Don't strip binary too +# Be sure buildpolicy set to do nothing +%define __spec_install_post %{nil} +%define debug_package %{nil} +%define __os_install_post %{_dbpath}/brp-compress + +Summary: A high-performance MySQL proxy +Name: proxysql +Version: %{version} +Release: 1 +License: GPL+ +Group: Development/Tools +SOURCE0 : %{name}-%{version}.tar.gz +URL: http://www.proxysql.com/ + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root + +%description +%{summary} + +%prep +%setup -q + +%build +# Empty section. + +%install +rm -rf %{buildroot} +mkdir -p %{buildroot} + +# in builddir +cp -a * %{buildroot} + +%clean +rm -rf %{buildroot} + +%post +mkdir /var/run/%{name} +chkconfig --add %{name} + +%preun +/etc/init.d/%{name} stop +chkconfig --del %{name} + +%postun +rm -rf /var/run/%{name} + +%files +%defattr(-,root,root,-) +%config(noreplace) %{_sysconfdir}/%{name}.cnf +%{_bindir}/* +%{_sysconfdir}/init.d/%{name} +/usr/share/proxysql/tools/proxysql_galera_checker.sh +/usr/share/proxysql/tools/proxysql_galera_writer.pl + +%changelog +* Wed Oct 19 2016 Rene Cannao 1.3.0 +- experimental support for Prepared Statements +- enhanced scalability +* Thu Sep 29 2016 Rene Cannao 1.2.4 +- Forth stable release of 1.2 +* Tue Sep 20 2016 Rene Cannao 1.2.3 +- Third stable release of 1.2 +* Fri Sep 2 2016 Rene Cannao 1.2.2 +- Second stable release of 1.2 +* Tue Aug 2 2016 Rene Cannao 1.2.1 +- First stable release of 1.2 +* Mon Mar 14 2016 Rene Cannao 1.2.0 +- First testing release of 1.2 +* Sat Mar 11 2016 Rene Cannao 1.1.2 +- Upgraded to release 1.1.2 +* Sat Oct 31 2015 Rene Cannao 1.0.1 +- Compiles 1.0.1 +* Wed Sep 9 2015 Andrei Ismail 0.2 +- Added support for automatic packaging on Ubuntu 14.04 and CentOS 7. diff --git a/docker/images/proxysql/fedora27-build/rpmmacros b/docker/images/proxysql/fedora27-build/rpmmacros new file mode 100644 index 000000000..a1d0f32f0 --- /dev/null +++ b/docker/images/proxysql/fedora27-build/rpmmacros @@ -0,0 +1,2 @@ +%_topdir %(echo $HOME)/rpmbuild +%_tmppath %{_topdir}/tmp \ No newline at end of file diff --git a/docker/images/proxysql/ubuntu-12.04-build/proxysql.ctl b/docker/images/proxysql/ubuntu-12.04-build/proxysql.ctl index a59f0e03b..e04fbf2b3 100644 --- a/docker/images/proxysql/ubuntu-12.04-build/proxysql.ctl +++ b/docker/images/proxysql/ubuntu-12.04-build/proxysql.ctl @@ -4,7 +4,7 @@ Homepage: http://www.proxysql.com Standards-Version: 3.9.2 Package: proxysql -Version: 1.4.7 +Version: 2.0.0 Maintainer: Rene Cannao Architecture: amd64 # Changelog: CHANGELOG.md diff --git a/docker/images/proxysql/ubuntu-14.04-build/proxysql.ctl b/docker/images/proxysql/ubuntu-14.04-build/proxysql.ctl index a59f0e03b..e04fbf2b3 100644 --- a/docker/images/proxysql/ubuntu-14.04-build/proxysql.ctl +++ b/docker/images/proxysql/ubuntu-14.04-build/proxysql.ctl @@ -4,7 +4,7 @@ Homepage: http://www.proxysql.com Standards-Version: 3.9.2 Package: proxysql -Version: 1.4.7 +Version: 2.0.0 Maintainer: Rene Cannao Architecture: amd64 # Changelog: CHANGELOG.md diff --git a/docker/images/proxysql/ubuntu-16.04-build/proxysql.ctl b/docker/images/proxysql/ubuntu-16.04-build/proxysql.ctl index a59f0e03b..e04fbf2b3 100644 --- a/docker/images/proxysql/ubuntu-16.04-build/proxysql.ctl +++ b/docker/images/proxysql/ubuntu-16.04-build/proxysql.ctl @@ -4,7 +4,7 @@ Homepage: http://www.proxysql.com Standards-Version: 3.9.2 Package: proxysql -Version: 1.4.7 +Version: 2.0.0 Maintainer: Rene Cannao Architecture: amd64 # Changelog: CHANGELOG.md