Build fixes
This commit is contained in:
René Cannaò
Родитель
5ef8de3eff
Коммит
a884e2d000
24
Makefile
24
Makefile
|
|
@ -44,37 +44,37 @@ clean:
|
|||
packages: centos7 ubuntu12 ubuntu14
|
||||
.PHONY: packages
|
||||
|
||||
centos7: binaries/proxysql-0.2.0902-1.x86_64.rpm
|
||||
centos7: binaries/proxysql-1.0.1-1.x86_64.rpm
|
||||
.PHONY: centos
|
||||
|
||||
ubuntu12: binaries/proxysql_0.2.0902-ubuntu12_amd64.deb
|
||||
ubuntu12: binaries/proxysql_1.0.1-ubuntu12_amd64.deb
|
||||
.PHONY: ubuntu12
|
||||
|
||||
ubuntu14: binaries/proxysql_0.2.0902-ubuntu14_amd64.deb
|
||||
ubuntu14: binaries/proxysql_1.0.1-ubuntu14_amd64.deb
|
||||
.PHONY: ubuntu14
|
||||
|
||||
binaries/proxysql-0.2.0902-1.x86_64.rpm:
|
||||
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 ./scenarios/centos7-build
|
||||
docker build -t centos7_proxysql --no-cache=true ./docker/images/proxysql/centos7-build
|
||||
docker run -i --name=centos7_build centos7_proxysql bash &
|
||||
sleep 5
|
||||
docker cp centos7_build:/root/rpmbuild/RPMS/x86_64/proxysql-0.2.0902-1.x86_64.rpm ./binaries
|
||||
docker cp centos7_build:/root/rpmbuild/RPMS/x86_64/proxysql-1.0.1-1.x86_64.rpm ./binaries
|
||||
# docker kill centos7_build
|
||||
docker rm centos7_build
|
||||
|
||||
binaries/proxysql_0.2.0902-ubuntu12_amd64.deb:
|
||||
docker build -t ubuntu12_proxysql --no-cache=true ./scenarios/ubuntu-12.04-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_0.2.0902_amd64.deb ./binaries/proxysql_0.2.0902-ubuntu12_amd64.deb
|
||||
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_0.2.0902-ubuntu14_amd64.deb:
|
||||
docker build -t ubuntu14_proxysql --no-cache=true ./scenarios/ubuntu-14.04-build
|
||||
binaries/proxysql_1.0.1-ubuntu14_amd64.deb:
|
||||
docker build -t ubuntu14_proxysql --no-cache=true ./docker/images/proxysql/ubuntu-14.04-build
|
||||
docker run -i --name=ubuntu14_build ubuntu14_proxysql bash &
|
||||
sleep 5
|
||||
docker cp ubuntu14_build:/opt/proxysql/proxysql_0.2.0902_amd64.deb ./binaries/proxysql_0.2.0902-ubuntu14_amd64.deb
|
||||
docker cp ubuntu14_build:/opt/proxysql/proxysql_1.0.1_amd64.deb ./binaries/proxysql_1.0.1-ubuntu14_amd64.deb
|
||||
# docker kill ubuntu14_build
|
||||
docker rm ubuntu14_build
|
||||
|
||||
|
|
|
|||
|
|
@ -20,18 +20,18 @@ RUN yum install -y openssl-devel
|
|||
RUN yum install -y patch
|
||||
|
||||
|
||||
RUN cd /opt; git clone https://github.com/sysown/proxysql-0.2.git proxysql
|
||||
RUN cd /opt; git clone https://github.com/sysown/proxysql.git proxysql
|
||||
RUN cd /opt/proxysql; make clean && make -j 5
|
||||
|
||||
RUN cd /opt/proxysql ; mkdir -p proxysql-0.2/usr/bin; mkdir -p proxysql-0.2/etc; cp src/proxysql proxysql-0.2/usr/bin/; cp -a etc proxysql-0.2 ; mv proxysql-0.2 proxysql-0.2.0902 ; tar czvf proxysql-0.2.0902.tar.gz proxysql-0.2.0902
|
||||
RUN cd /opt/proxysql ; mkdir -p proxysql/usr/bin; mkdir -p proxysql/etc; cp src/proxysql proxysql/usr/bin/; cp -a etc proxysql ; mv proxysql proxysql-1.0.1 ; tar czvf proxysql-1.0.1.tar.gz proxysql-1.0.1
|
||||
|
||||
RUN mkdir -p /root/rpmbuild/{RPMS,SRPMS,BUILD,SOURCES,SPECS,tmp}
|
||||
|
||||
ADD ./rpmmacros /root/.rpmmacros
|
||||
ADD ./proxysql.spec /root/rpmbuild/SPECS/proxysql.spec
|
||||
|
||||
RUN cp /opt/proxysql/proxysql-0.2.0902.tar.gz /root/rpmbuild/SOURCES
|
||||
RUN cp /opt/proxysql/proxysql-1.0.1.tar.gz /root/rpmbuild/SOURCES
|
||||
|
||||
RUN yum install -y rpm-build
|
||||
RUN cd /root/rpmbuild; rpmbuild -ba SPECS/proxysql.spec
|
||||
RUN cp /root/rpmbuild/RPMS/x86_64/proxysql-0.2.0902-1.x86_64.rpm /root/rpm
|
||||
RUN cp /root/rpmbuild/RPMS/x86_64/proxysql-1.0.1-1.x86_64.rpm /root/rpm
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
Summary: A high-performance MySQL proxy
|
||||
Name: proxysql
|
||||
Version: 0.2.0902
|
||||
Version: 1.0.1
|
||||
Release: 1
|
||||
License: GPL+
|
||||
Group: Development/Tools
|
||||
|
|
@ -50,5 +50,7 @@ chkconfig --del %{name}
|
|||
%{_sysconfdir}/init.d/%{name}
|
||||
|
||||
%changelog
|
||||
* Sat Oct 31 2015 Rene Cannao <rene.cannao@gmail.com> 1.0.1
|
||||
- Compiles 1.0.1
|
||||
* Wed Sep 9 2015 Andrei Ismail <iandrei@gmail.com> 0.2
|
||||
- Added support for automatic packaging on Ubuntu 14.04 and CentOS 7.
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ RUN apt-get update && apt-get install -y\
|
|||
|
||||
RUN cd /root ; wget http://www.cmake.org/files/v3.3/cmake-3.3.1.tar.gz ; tar -zxf cmake-3.3.1.tar.gz ; cd cmake-3.3.1 ; mkdir _build ; cd _build ; cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr ; make -j 5 ; make install ; ldconfig
|
||||
|
||||
RUN cd /opt; git clone https://github.com/sysown/proxysql-0.2.git proxysql
|
||||
RUN cd /opt; git clone https://github.com/sysown/proxysql.git proxysql
|
||||
RUN cd /opt/proxysql; make clean && make -j
|
||||
|
||||
ADD ./proxysql.ctl /opt/proxysql/proxysql.ctl
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ Priority: optional
|
|||
Homepage: http://www.proxysql.com
|
||||
|
||||
Package: proxysql
|
||||
Version: 0.2.0902
|
||||
Version: 1.0.1
|
||||
Maintainer: Rene Cannao <rene.cannao@gmail.com>
|
||||
Architecture: amd64
|
||||
# Changelog: CHANGELOG.md
|
||||
|
|
|
|||
|
|
@ -22,9 +22,7 @@ RUN apt-get update && apt-get install -y\
|
|||
libssl-dev\
|
||||
libtool
|
||||
|
||||
RUN apt-get install -y wget unzip
|
||||
#RUN cd /opt; git clone https://github.com/sysown/proxysql-0.2.git proxysql
|
||||
RUN cd /opt ; wget https://github.com/sysown/proxysql-0.2/archive/1.0.zip ; unzip 1.0.zip ; mv proxysql-0.2-1.0 proxysql
|
||||
RUN cd /opt; git clone https://github.com/sysown/proxysql.git proxysql
|
||||
RUN cd /opt/proxysql; make clean && make -j
|
||||
|
||||
ADD ./proxysql.ctl /opt/proxysql/proxysql.ctl
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ Homepage: http://www.proxysql.com
|
|||
Standards-Version: 3.9.2
|
||||
|
||||
Package: proxysql
|
||||
Version: 0.2.0902
|
||||
Version: 1.0.1
|
||||
Maintainer: Rene Cannao <rene.cannao@gmail.com>
|
||||
Architecture: amd64
|
||||
# Changelog: CHANGELOG.md
|
||||
|
|
|
|||
|
|
@ -37,8 +37,9 @@ class QP_rule_text_hitsonly {
|
|||
class QP_rule_text {
|
||||
public:
|
||||
char **pta;
|
||||
const int num_fields=18;
|
||||
int num_fields;
|
||||
QP_rule_text(QP_rule_t *QPr) {
|
||||
num_fields=18;
|
||||
pta=NULL;
|
||||
pta=(char **)malloc(sizeof(char *)*num_fields);
|
||||
itostr(pta[0], (long long)QPr->rule_id);
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче