From 810ffccbff83a80171e313e0d9270fb84894ea30 Mon Sep 17 00:00:00 2001
From: Juanma <juanmanuel.torres@guadaltech.es>
Date: Sun, 1 Apr 2018 23:25:26 +0200
Subject: [PATCH] psql

---
 pgbouncer/docker/Dockerfile                   |  4 +++-
 pgpool/docker/Dockerfile-centos               |  1 +
 pgpool/docker/Makefile                        | 18 ++++++++----------
 pgpool/docker/bin/pgpool/startpgpool.sh       |  1 +
 pgpool/docker/conf/pgpool/default.pgpool.conf |  2 ++
 pgpool/docker/conf/pgpool/pgpool.conf         |  2 ++
 6 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/pgbouncer/docker/Dockerfile b/pgbouncer/docker/Dockerfile
index 66a701c..a72a95e 100644
--- a/pgbouncer/docker/Dockerfile
+++ b/pgbouncer/docker/Dockerfile
@@ -4,7 +4,9 @@ MAINTAINER Juan Manuel Torres <juanmanuel.torres@aventurabinaria.es>
 RUN apt-get update \
     && apt-get install -y \
         nano \
-        pgbouncer
+        pgbouncer \
+        postgresql-client-9.6 \
+        postgresql-client-common
 
 VOLUME /files/users
 EXPOSE 5432
diff --git a/pgpool/docker/Dockerfile-centos b/pgpool/docker/Dockerfile-centos
index 6401552..4963bb5 100644
--- a/pgpool/docker/Dockerfile-centos
+++ b/pgpool/docker/Dockerfile-centos
@@ -56,6 +56,7 @@ ENV PGHOST="/tmp/" \
     PCPUSER="admin" \
     PCPPASS="admin" \
     PG_NUM_INIT_CHILDREN="400" \
+    PG_MULTIPLER_BACK="8" \
     PG_MAX_POOL="4" \
     PG_CHILD_LIFE_TIME="3600" \
     PG_CLIENT_IDLE_LIMIT="3600" \
diff --git a/pgpool/docker/Makefile b/pgpool/docker/Makefile
index 2491640..8e25908 100644
--- a/pgpool/docker/Makefile
+++ b/pgpool/docker/Makefile
@@ -1,16 +1,14 @@
 
-build:
-	docker build -f Dockerfile-centos -t tedezed/pgpool-centos:latest .
+CONTAINER_REPO:=tedezed
+CONTAINER_IMAGE:=pgpool-centos
+CONTAINER_VERSION:=latest
 
-build-debian:
-	docker build -f Dockerfile-debian -t tedezed/pgpool-debian:latest .
+build:
+	docker build -f Dockerfile-centos -t ${CONTAINER_REPO}/${CONTAINER_IMAGE}:${CONTAINER_VERSION} .
 
 push:
-	docker push tedezed/pgpool-centos:latest
-
-push-debian:
-	docker push tedezed/pgpool-debian:latest
+	docker push ${CONTAINER_REPO}/${CONTAINER_IMAGE}:${CONTAINER_VERSION}
 
 all:
-	docker build -f Dockerfile-centos -t tedezed/pgpool-centos:latest .
-	docker push tedezed/pgpool-centos:latest
+	docker build -f Dockerfile-centos -t ${CONTAINER_REPO}/${CONTAINER_IMAGE}:${CONTAINER_VERSION} .
+	docker push ${CONTAINER_REPO}/${CONTAINER_IMAGE}:${CONTAINER_VERSION}
diff --git a/pgpool/docker/bin/pgpool/startpgpool.sh b/pgpool/docker/bin/pgpool/startpgpool.sh
index a155460..1bc906e 100644
--- a/pgpool/docker/bin/pgpool/startpgpool.sh
+++ b/pgpool/docker/bin/pgpool/startpgpool.sh
@@ -44,6 +44,7 @@ sed -i "s/PG_PASSWORD/$PG_PASSWORD/g" $CONFIGS/pgpool.conf
 # Personal configuration
 sed -i "s/PG_NUM_INIT_CHILDREN/$PG_NUM_INIT_CHILDREN/g" $CONFIGS/pgpool.conf
 sed -i "s/PG_MAX_POOL/$PG_MAX_POOL/g" $CONFIGS/pgpool.conf
+sed -i "s/PG_MULTIPLER_BACK/$PG_MULTIPLER_BACK/g" $CONFIGS/pgpool.conf
 sed -i "s/PG_CHILD_LIFE_TIME/$PG_CHILD_LIFE_TIME/g" $CONFIGS/pgpool.conf
 sed -i "s/PG_CLIENT_IDLE_LIMIT/$PG_CLIENT_IDLE_LIMIT/g" $CONFIGS/pgpool.conf
 sed -i "s/PG_MAX_CONNECTIONS/$PG_MAX_CONNECTIONS/g" $CONFIGS/pgpool.conf
diff --git a/pgpool/docker/conf/pgpool/default.pgpool.conf b/pgpool/docker/conf/pgpool/default.pgpool.conf
index 05392b7..c1931de 100644
--- a/pgpool/docker/conf/pgpool/default.pgpool.conf
+++ b/pgpool/docker/conf/pgpool/default.pgpool.conf
@@ -125,6 +125,8 @@ max_pool = PG_MAX_POOL
                                    # Number of connections per pool
                                    # (change requires restart)
 
+listen_backlog_multiplier = PG_MAX_POOL
+
 # - Life time -
 
 child_life_time = PG_CHILD_LIFE_TIME
diff --git a/pgpool/docker/conf/pgpool/pgpool.conf b/pgpool/docker/conf/pgpool/pgpool.conf
index 87304ff..81673eb 100644
--- a/pgpool/docker/conf/pgpool/pgpool.conf
+++ b/pgpool/docker/conf/pgpool/pgpool.conf
@@ -124,6 +124,8 @@ max_pool = PG_MAX_POOL
                                    # Number of connections per pool
                                    # (change requires restart)
 
+listen_backlog_multiplier = PG_MULTIPLER_BACK
+
 # - Life time -
 
 child_life_time = PG_CHILD_LIFE_TIME