dom/telegraf
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "add pgbouncer plugin"

Browse Source 
This reverts commit fec9760f72.
This commit is contained in:
Cameron Sparr
2016-08-17 16:50:11 +01:00
parent 7600757f16
commit 94e673fe85
7 changed files with 2 additions and 466 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Makefile
View File

@@ -57,13 +57,6 @@ docker-run:
docker run --name mqtt -p "1883:1883" -d ncarlier/mqtt
docker run --name riemann -p "5555:5555" -d blalor/riemann
docker run --name snmp -p "31161:31161/udp" -d titilambert/snmpsim
docker run --name pgbouncer \
-p "6432:6432" \
-e PGB_USERLISTS="postgres:postgres" \
-e PGB_ADMIN_USERS="postgres" \
-e PGB_STATS_USERS="postgres" \
--link postgres:pg \
-d jsvisa/pgbouncer
# Run docker containers necessary for CircleCI unit tests
docker-run-circle:
@@ -77,17 +70,11 @@ docker-run-circle:
docker run --name mqtt -p "1883:1883" -d ncarlier/mqtt
docker run --name riemann -p "5555:5555" -d blalor/riemann
docker run --name snmp -p "31161:31161/udp" -d titilambert/snmpsim
docker run --name pgbouncer \
-p "6432:6432" \
-e PGB_USERLISTS="postgres:postgres" \
-e PGB_ADMIN_USERS="postgres" \
-e PGB_STATS_USERS="postgres" \
-d jsvisa/pgbouncer
# Kill all docker containers, ignore errors
docker-kill:
-docker kill nsq aerospike redis rabbitmq postgres memcached mysql kafka mqtt riemann snmp pgbouncer
-docker rm nsq aerospike redis rabbitmq postgres memcached mysql kafka mqtt riemann snmp pgbouncer
-docker kill nsq aerospike redis rabbitmq postgres memcached mysql kafka mqtt riemann snmp
-docker rm nsq aerospike redis rabbitmq postgres memcached mysql kafka mqtt riemann snmp
# Run full unit tests using docker containers (includes setup and teardown)
test: vet docker-kill docker-run