Use docker-compose with pg

Author: bmarkons

pg/Dockerfile

@@ -9,5 +9,3 @@ RUN apt-get update && apt-get install -y postgresql-client
 RUN git clone --verbose --branch master --single-branch https://github.com/ruby-bench/ruby-bench-suite.git
 RUN echo "gem: --no-ri --no-rdoc" > ~/.gemrc
 RUN /bin/bash -l -c "gem install bundler"
-
-CMD /bin/bash -l -c "./runner"

pg/docker-compose.yml

@@ -0,0 +1,9 @@
+version: '3'
+services:
+  postgres:
+    image: postgres:9.6
+
+  pg_master:
+    build: .
+    depends_on:
+      - postgres

pg/runner

@@ -1,13 +1,12 @@
 #!/bin/bash
 set -e
 
-while ! exec 6<>/dev/tcp/${POSTGRES_PORT_5432_TCP_ADDR}/${POSTGRES_PORT_5432_TCP_PORT}; do
-  echo "$(date) - still trying to connect to Postgres server"
+until pg_isready -h postgres; do
   sleep 1
 done
 
-dropdb --if-exists -h "$POSTGRES_PORT_5432_TCP_ADDR" -p "$POSTGRES_PORT_5432_TCP_PORT" -U postgres rubybench
-createdb -h "$POSTGRES_PORT_5432_TCP_ADDR" -p "$POSTGRES_PORT_5432_TCP_PORT" -U postgres rubybench
+dropdb --if-exists -h postgres -U postgres rubybench
+createdb -h postgres -U postgres rubybench
 
 cd /ruby-bench-suite/pg
 

scripts/pg/master.sh

@@ -3,24 +3,25 @@
 mkdir -p $HOME/logs/pg/master
 exec &>> $HOME/logs/pg/master/run.log
 
-echo "-----------$(date)"
+echo
+echo
+echo
+echo
+echo "-------------$(date)"
 
 API_NAME=$1
 API_PASSWORD=$2
 PATTERNS=$3
 
 set -x
 
-docker pull rubybench/pg_master
+cd $HOME/ruby-bench-docker/rails/master
 
-docker run --name postgres -d postgres:9.6 -c shared_buffers=500MB -c fsync=off -c full_page_writes=off
-
-docker run --rm \
-  --link postgres:postgres \
+docker-compose run \
   -e "API_NAME=$API_NAME" \
   -e "API_PASSWORD=$API_PASSWORD" \
   -e "INCLUDE_PATTERNS=$PATTERNS" \
-  rubybench/pg_master
+  pg_master \
+  /bin/bash -l -c "./runner"
 
-docker stop postgres
-docker rm -v postgres
+docker-compose down