Setup docker-compose

Author: bmarkons

rails/rails_trunk/rails_benchmarks/Dockerfile

@@ -1,9 +1,13 @@
 FROM rubybench/ruby:0.5
 MAINTAINER Alan Guo Xiang Tan "https://twitter.com/tgx_world"
 
-RUN apt-get update
-
-RUN apt-get install -y libncurses5-dev libmysqlclient-dev sqlite3 libsqlite3-dev postgresql-client mysql-client
+RUN apt-get update && apt-get install -y \
+      libncurses5-dev \
+      libmysqlclient-dev \
+      sqlite3 \
+      libsqlite3-dev \
+      postgresql-client \
+      mysql-client
 
 RUN git clone --verbose --branch master --single-branch https://github.com/ruby-bench/ruby-bench-suite.git
 RUN git clone --verbose --branch master --single-branch https://github.com/rails/rails.git

rails/rails_trunk/rails_benchmarks/docker-compose.yml

@@ -0,0 +1,19 @@
+version: '3'
+services:
+  postgres:
+    image: postgres:9.6
+
+  mysql:
+    image: mysql:5.6.24
+    environment:
+      - MYSQL_ALLOW_EMPTY_PASSWORD=yes
+
+  redis:
+    image: redis:2.8.19
+
+  rails_master:
+    build: .
+    depends_on:
+      - postgres
+      - mysql
+      - redis

rails/rails_trunk/rails_benchmarks/runner

@@ -1,20 +1,10 @@
 #!/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"
-  sleep 1
-done
-
-while ! exec 6<>/dev/tcp/${MYSQL_PORT_3306_TCP_ADDR}/${MYSQL_PORT_3306_TCP_PORT}; do
-  echo "$(date) - still trying to connect to Mysql server"
-  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
-echo "DROP DATABASE IF EXISTS rubybench" | mysql -u root -h "$MYSQL_PORT_3306_TCP_ADDR" -P "MYSQL_PORT_3306_TCP_PORT"
-echo "CREATE DATABASE rubybench" | mysql -u root -h "$MYSQL_PORT_3306_TCP_ADDR" -P "MYSQL_PORT_3306_TCP_PORT"
+dropdb --if-exists -h postgres -U postgres rubybench
+createdb -h postgres -U postgres rubybench
+echo "DROP DATABASE IF EXISTS rubybench" | mysql -u root -h mysql
+echo "CREATE DATABASE rubybench" | mysql -u root -h mysql
 
 echo "gem: --no-ri --no-rdoc" > ~/.gemrc
 gem update bundler

sequel/sequel_trunk/sequel_benchmarks/Dockerfile

@@ -1,8 +1,11 @@
 FROM rubybench/ruby:0.5
 MAINTAINER Alan Guo Xiang Tan "https://twitter.com/tgx_world"
 
-RUN apt-get update
-RUN apt-get install -y libncurses5-dev libmysqlclient-dev postgresql-client mysql-client
+RUN apt-get update && apt-get install -y \
+      libncurses5-dev \
+      libmysqlclient-dev \
+      postgresql-client \
+      mysql-client
 
 RUN git clone --verbose --branch master --single-branch https://github.com/ruby-bench/ruby-bench-suite.git
 RUN git clone --verbose --branch master --single-branch https://github.com/jeremyevans/sequel.git

sequel/sequel_trunk/sequel_benchmarks/docker-compose.yml

@@ -0,0 +1,15 @@
+version: '3'
+services:
+  postgres:
+    image: postgres:9.6
+
+  mysql:
+    image: mysql:5.6.24
+    environment:
+      - MYSQL_ALLOW_EMPTY_PASSWORD=yes
+
+  sequel_trunk:
+    build: .
+    depends_on:
+      - postgres
+      - mysql

sequel/sequel_trunk/sequel_benchmarks/runner

@@ -1,20 +1,10 @@
 #!/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"
-  sleep 1
-done
-
-while ! exec 6<>/dev/tcp/${MYSQL_PORT_3306_TCP_ADDR}/${MYSQL_PORT_3306_TCP_PORT}; do
-  echo "$(date) - still trying to connect to Mysql server"
-  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
-echo "DROP DATABASE IF EXISTS rubybench" | mysql -u root -h "$MYSQL_PORT_3306_TCP_ADDR" -P "MYSQL_PORT_3306_TCP_PORT"
-echo "CREATE DATABASE rubybench" | mysql -u root -h "$MYSQL_PORT_3306_TCP_ADDR" -P "MYSQL_PORT_3306_TCP_PORT"
+dropdb --if-exists -h postgres -U postgres rubybench
+createdb -h postgres -U postgres rubybench
+echo "DROP DATABASE IF EXISTS rubybench" | mysql -u root -h mysql
+echo "CREATE DATABASE rubybench" | mysql -u root -h mysql
 
 echo "gem: --no-ri --no-rdoc" > ~/.gemrc
 gem update bundler