Skip to content

Commit

Permalink
Preparing release 1.1.0
Browse files Browse the repository at this point in the history
Removed support for Ubuntu 12
Added support for Debian 7
Added support for Debian 8
Upgraded to version 1.1.0
  • Loading branch information
renecannao committed Dec 23, 2015
1 parent f85ca85 commit 5662c0a
Show file tree
Hide file tree
Showing 6 changed files with 40 additions and 72 deletions.
53 changes: 37 additions & 16 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -46,18 +46,21 @@ clean:
cd lib && ${MAKE} clean
cd src && ${MAKE} clean

packages: centos7 ubuntu12 ubuntu14
packages: centos7 ubuntu14 debian7 debian8
.PHONY: packages

centos7: binaries/proxysql-1.0.1-1.x86_64.rpm
.PHONY: centos

ubuntu12: binaries/proxysql_1.0.1-ubuntu12_amd64.deb
.PHONY: ubuntu12

ubuntu14: binaries/proxysql_1.0.1-ubuntu14_amd64.deb
ubuntu14: binaries/proxysql_1.1.0-ubuntu14_amd64.deb
.PHONY: ubuntu14

debian7: binaries/proxysql_1.1.0-debian7_amd64.deb
.PHONY: debian7

debian8: binaries/proxysql_1.1.0-debian8_amd64.deb
.PHONY: debian8

binaries/proxysql-1.0.1-1.x86_64.rpm:
# Create CentOS 7 rpm file by creating docker image, running a container and extracting the RPM from the temp container
docker build -t centos7_proxysql --no-cache=true ./docker/images/proxysql/centos7-build
Expand All @@ -67,27 +70,45 @@ binaries/proxysql-1.0.1-1.x86_64.rpm:
# docker kill centos7_build
docker rm centos7_build

binaries/proxysql_1.0.1-ubuntu12_amd64.deb:
docker build -t ubuntu12_proxysql --no-cache=true ./docker/images/proxysql/ubuntu-12.04-build
docker run -i --name=ubuntu12_build ubuntu12_proxysql bash &
sleep 5
docker cp ubuntu12_build:/opt/proxysql/proxysql_1.0.1_amd64.deb ./binaries/proxysql_1.0.1-ubuntu12_amd64.deb
# docker kill ubuntu12_build
docker rm ubuntu12_build

binaries/proxysql_1.0.1-ubuntu14_amd64.deb:
binaries/proxysql_1.1.0-ubuntu14_amd64.deb:
docker stop ubuntu14_build || true
docker rm ubuntu14_build || true
docker create --name ubuntu14_build renecannao/proxysql:build-ubuntu14 bash -c "while : ; do sleep 10 ; done"
docker start ubuntu14_build
docker exec ubuntu14_build bash -c "cd /opt; git clone https://github.com/sysown/proxysql.git proxysql"
docker exec ubuntu14_build bash -c "cd /opt/proxysql; ${MAKE} clean && ${MAKE} -j"
docker exec ubuntu14_build bash -c "cd /opt/proxysql; ${MAKE} clean && ${MAKE} -j 4 build_deps && ${MAKE} -j 4"
docker cp docker/images/proxysql/ubuntu-14.04-build/proxysql.ctl ubuntu14_build:/opt/proxysql/
docker exec ubuntu14_build bash -c "cd /opt/proxysql; cp src/proxysql . ; equivs-build proxysql.ctl"
docker cp ubuntu14_build:/opt/proxysql/proxysql_1.0.1_amd64.deb ./binaries/proxysql_1.0.1-ubuntu14_amd64.deb
docker cp ubuntu14_build:/opt/proxysql/proxysql_1.1.0_amd64.deb ./binaries/proxysql_1.1.0-ubuntu14_amd64.deb
docker stop ubuntu14_build
docker rm ubuntu14_build

binaries/proxysql_1.1.0-debian7_amd64.deb:
docker stop debian7_build || true
docker rm debian7_build || true
docker create --name debian7_build renecannao/proxysql:build-debian7 bash -c "while : ; do sleep 10 ; done"
docker start debian7_build
docker exec debian7_build bash -c "cd /opt; git clone https://github.com/sysown/proxysql.git proxysql"
docker exec debian7_build bash -c "cd /opt/proxysql; ${MAKE} clean && ${MAKE} -j 4 build_deps && ${MAKE} -j 4"
docker cp docker/images/proxysql/debian-7.8-build/proxysql.ctl debian7_build:/opt/proxysql/
docker exec debian7_build bash -c "cd /opt/proxysql; cp src/proxysql . ; equivs-build proxysql.ctl"
docker cp debian7_build:/opt/proxysql/proxysql_1.1.0_amd64.deb ./binaries/proxysql_1.1.0-debian7_amd64.deb
docker stop debian7_build
docker rm debian7_build

binaries/proxysql_1.1.0-debian8_amd64.deb:
docker stop debian8_build || true
docker rm debian8_build || true
docker create --name debian8_build renecannao/proxysql:build-debian8 bash -c "while : ; do sleep 10 ; done"
docker start debian8_build
docker exec debian8_build bash -c "cd /opt; git clone https://github.com/sysown/proxysql.git proxysql"
docker exec debian8_build bash -c "cd /opt/proxysql; ${MAKE} clean && ${MAKE} -j 4 build_deps && ${MAKE} -j 4"
docker cp docker/images/proxysql/debian-8.2-build/proxysql.ctl debian8_build:/opt/proxysql/
docker exec debian8_build bash -c "cd /opt/proxysql; cp src/proxysql . ; equivs-build proxysql.ctl"
docker cp debian8_build:/opt/proxysql/proxysql_1.1.0_amd64.deb ./binaries/proxysql_1.1.0-debian8_amd64.deb
docker stop debian8_build
docker rm debian8_build


.PHONY: cleanall
cleanall:
Expand Down
2 changes: 1 addition & 1 deletion docker/images/proxysql/centos7-build/proxysql.spec
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

Summary: A high-performance MySQL proxy
Name: proxysql
Version: 1.0.1
Version: 1.1.0
Release: 1
License: GPL+
Group: Development/Tools
Expand Down
32 changes: 0 additions & 32 deletions docker/images/proxysql/ubuntu-12.04-build/Dockerfile

This file was deleted.

21 changes: 0 additions & 21 deletions docker/images/proxysql/ubuntu-12.04-build/proxysql.ctl

This file was deleted.

2 changes: 1 addition & 1 deletion docker/images/proxysql/ubuntu-14.04-build/proxysql.ctl
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Homepage: http://www.proxysql.com
Standards-Version: 3.9.2

Package: proxysql
Version: 1.0.1
Version: 1.1.0
Maintainer: Rene Cannao <[email protected]>
Architecture: amd64
# Changelog: CHANGELOG.md
Expand Down
2 changes: 1 addition & 1 deletion include/proxysql.h
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
#else
#define DEB ""
#endif /* DEBUG */
#define PROXYSQL_VERSION "20150902" DEB
#define PROXYSQL_VERSION "1.1.0" DEB
#define PROXYSQL_CODENAME "Kleon"

#ifndef PROXYSQL_FUNC_DEFS
Expand Down

0 comments on commit 5662c0a

Please sign in to comment.