Skip to content
Permalink
Browse files

Merge branch 'v2.0.8' of https://github.com/sysown/proxysql into v2.0.8

  • Loading branch information
renecannao committed Nov 5, 2019
2 parents f829ebc + ec407d0 commit 877cab1e267aee57c547976e9f01f18026264f08
Showing with 64 additions and 2 deletions.
  1. +23 −2 Makefile
  2. +41 −0 docker-compose.yml
@@ -113,7 +113,7 @@ build_src_testall: build_deps build_lib_testall
build_lib_testall: build_deps_debug
cd lib && OPTZ="${O0} -ggdb -DDEBUG -DTEST_AURORA -DTEST_GALERA -DTEST_GROUPREP" CC=${CC} CXX=${CXX} ${MAKE}

.PHONY: build_tap_test
.PHONY: build_tap_test
build_tap_test: build_src
cd test/tap && OPTZ="${O0} -ggdb -DDEBUG" CC=${CC} CXX=${CXX} ${MAKE}

@@ -152,7 +152,7 @@ clean:
cd src && ${MAKE} clean
cd test/tap && ${MAKE} clean

packages: centos6.7 centos6.7-dbg centos7 centos7-dbg centos7-clickhouse ubuntu14 ubuntu14-dbg ubuntu16 ubuntu16-dbg ubuntu16-clickhouse ubuntu18 ubuntu18-dbg ubuntu18-clickhouse debian7 debian7-dbg debian8 debian8-dbg debian9 debian9-dbg debian9-clickhouse debian10 debian10-dbg debian10-clickhouse fedora24 fedora24-dbg fedora24-clickhouse fedora27 fedora27-dbg fedora27-clickhouse fedora28 fedora28-dbg fedora28-clickhouse
packages: centos6.7 centos6.7-dbg centos7 centos7-dbg centos7-clickhouse centos8 centos8-dbg centos8-clickhouse ubuntu14 ubuntu14-dbg ubuntu16 ubuntu16-dbg ubuntu16-clickhouse ubuntu18 ubuntu18-dbg ubuntu18-clickhouse debian7 debian7-dbg debian8 debian8-dbg debian9 debian9-dbg debian9-clickhouse debian10 debian10-dbg debian10-clickhouse fedora24 fedora24-dbg fedora24-clickhouse fedora27 fedora27-dbg fedora27-clickhouse fedora28 fedora28-dbg fedora28-clickhouse
.PHONY: packages

centos5: binaries/proxysql-${CURVER}-1-centos5.x86_64.rpm
@@ -167,12 +167,18 @@ centos6.7: binaries/proxysql-${CURVER}-1-centos67.x86_64.rpm
centos7: binaries/proxysql-${CURVER}-1-centos7.x86_64.rpm
.PHONY: centos7

centos8: binaries/proxysql-${CURVER}-1-centos8.x86_64.rpm
.PHONY: centos8

centos6.7-dbg: binaries/proxysql-${CURVER}-1-dbg-centos67.x86_64.rpm
.PHONY: centos6.7-dbg

centos7-dbg: binaries/proxysql-${CURVER}-1-dbg-centos7.x86_64.rpm
.PHONY: centos7-dbg

centos8-dbg: binaries/proxysql-${CURVER}-1-dbg-centos8.x86_64.rpm
.PHONY: centos8-dbg

fedora24: binaries/proxysql-${CURVER}-1-fedora24.x86_64.rpm
.PHONY: fedora24

@@ -257,6 +263,9 @@ debian10-clickhouse: binaries/proxysql_${CURVER}-clickhouse-debian10_amd64.deb
centos7-clickhouse: binaries/proxysql-${CURVER}-clickhouse-1-centos7.x86_64.rpm
.PHONY: centos7-clickhouse

centos8-clickhouse: binaries/proxysql-${CURVER}-clickhouse-1-centos8.x86_64.rpm
.PHONY: centos8-clickhouse

fedora24-clickhouse: binaries/proxysql-${CURVER}-clickhouse-1-fedora24.x86_64.rpm
.PHONY: fedora24-clickhouse

@@ -294,6 +303,18 @@ binaries/proxysql-${CURVER}-1-dbg-centos7.x86_64.rpm:
docker-compose up centos7_dbg_build
docker-compose rm -f

binaries/proxysql-${CURVER}-1-centos8.x86_64.rpm:
docker-compose up centos8_build
docker-compose rm -f

binaries/proxysql-${CURVER}-clickhouse-1-centos8.x86_64.rpm:
docker-compose up centos8_ch_build
docker-compose rm -f

binaries/proxysql-${CURVER}-1-dbg-centos8.x86_64.rpm:
docker-compose up centos8_dbg_build
docker-compose rm -f

binaries/proxysql-${CURVER}-1-fedora24.x86_64.rpm:
docker-compose up fedora24_build
docker-compose rm -f
@@ -95,6 +95,47 @@ services:
- PROXYSQL_BUILD_TYPE=clickhouse
command:
- /opt/entrypoint/entrypoint.bash
centos8_build:
image: proxysql/packaging:build-centos8
volumes:
- ./docker/images/proxysql/rhel-compliant/rhel7/rpmmacros/:/root/
- ./docker/images/proxysql/rhel-compliant/rhel7/entrypoint/:/opt/entrypoint/
- ./:/opt/proxysql/
environment:
- MAKE
- MAKEOPT
- CURVER
- PKG_RELEASE=centos8
command:
- /opt/entrypoint/entrypoint.bash
centos8_dbg_build:
image: proxysql/packaging:build-centos8
volumes:
- ./docker/images/proxysql/rhel-compliant/rhel7/rpmmacros/:/root/
- ./docker/images/proxysql/rhel-compliant/rhel7/entrypoint/:/opt/entrypoint/
- ./:/opt/proxysql/
environment:
- MAKE
- MAKEOPT
- CURVER
- PKG_RELEASE=dbg-centos8
- PROXYSQL_BUILD_TYPE=debug
command:
- /opt/entrypoint/entrypoint.bash
centos8_ch_build:
image: proxysql/packaging:build-centos8
volumes:
- ./docker/images/proxysql/rhel-compliant/rhel7/rpmmacros/:/root/
- ./docker/images/proxysql/rhel-compliant/rhel7/entrypoint/:/opt/entrypoint/
- ./:/opt/proxysql/
environment:
- MAKE
- MAKEOPT
- CURVER
- PKG_RELEASE=clickhouse-centos8
- PROXYSQL_BUILD_TYPE=clickhouse
command:
- /opt/entrypoint/entrypoint.bash
fedora24_build:
image: proxysql/packaging:build-fedora24
volumes:

0 comments on commit 877cab1

Please sign in to comment.
You can’t perform that action at this time.