Use docker-compose in runner scripts

Author: bmarkons

rails/master/Dockerfile

@@ -15,5 +15,3 @@ RUN /bin/bash -l -c "gem install bundler --no-ri --no-rdoc && cd /rails && bundl
 
 ADD runner runner
 RUN chmod 755 runner
-
-CMD /bin/bash -l -c "./runner"

scripts/rails/master.sh

@@ -16,22 +16,15 @@ PATTERNS=$4
 
 set -x
 
-docker pull rubybench/rails_trunk
+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 --name mysql -e "MYSQL_ALLOW_EMPTY_PASSWORD=yes" -d mysql:5.6.24
-docker run --name redis -d redis:2.8.19
-
-docker run --rm \
-  --link postgres:postgres \
-  --link mysql:mysql \
-  --link redis:redis \
+docker-compose run \
   -e "RAILS_COMMIT_HASH=$COMMIT_HASH" \
   -e "API_NAME=$API_NAME" \
   -e "API_PASSWORD=$API_PASSWORD" \
   -e "MYSQL2_PREPARED_STATEMENTS=1" \
   -e "INCLUDE_PATTERNS=$PATTERNS" \
-  rubybench/rails_trunk
+  rails_master \
+  /bin/bash -l -c "./runner"
 
-docker stop postgres mysql redis
-docker rm -v postgres mysql redis
+docker-compose down

scripts/sequel/master.sh

@@ -3,7 +3,11 @@
 mkdir -p $HOME/logs/sequel/master
 exec &>> $HOME/logs/sequel/master/run.log
 
-echo "-----------$(date)"
+echo
+echo
+echo
+echo
+echo -------------$(date)
 
 SEQUEL_COMMIT_HASH=$1
 API_NAME=$2
@@ -12,22 +16,15 @@ PATTERNS=$4
 
 set -x
 
-docker pull rubybench/sequel_trunk
+cd $HOME/ruby-bench-docker/sequel/master
 
-docker run --name postgres -d postgres:9.6 -c shared_buffers=500MB -c fsync=off -c full_page_writes=off
-docker run --name mysql -e "MYSQL_ALLOW_EMPTY_PASSWORD=yes" -d mysql:5.6.24
-docker run --name redis -d redis:2.8.19
-
-docker run --rm \
-  --link postgres:postgres \
-  --link mysql:mysql \
-  --link redis:redis \
-  -e "SEQUEL_COMMIT_HASH=$SEQUEL_COMMIT_HASH" \
+docker-compose run \
+  -e "SEQUEL_COMMIT_HASH=$COMMIT_HASH" \
   -e "API_NAME=$API_NAME" \
   -e "API_PASSWORD=$API_PASSWORD" \
   -e "MYSQL2_PREPARED_STATEMENTS=1" \
   -e "INCLUDE_PATTERNS=$PATTERNS" \
-  rubybench/sequel_trunk
+  sequel_master \
+  /bin/bash -l -c "./runner"
 
-docker stop postgres mysql redis
-docker rm -v postgres mysql redis
+docker-compose down

sequel/master/Dockerfile

@@ -13,5 +13,3 @@ RUN /bin/bash -l -c "gem install bundler --no-ri --no-rdoc && cd /sequel && bund
 
 ADD runner runner
 RUN chmod 755 runner
-
-CMD /bin/bash -l -c "./runner"

sequel/master/docker-compose.yml

@@ -8,7 +8,7 @@ services:
     environment:
       - MYSQL_ALLOW_EMPTY_PASSWORD=yes
 
-  sequel_trunk:
+  sequel_master:
     build: .
     depends_on:
       - postgres