From fdac3d4ec74902b52db1f8b55c259f03e519df06 Mon Sep 17 00:00:00 2001
From: Daigo Sakamoto <daigo@treasure-data.com>
Date: Thu, 15 Jun 2017 12:23:01 +0900
Subject: [PATCH 1/6] fix indentation

---
 docker-compose.yml | 82 +++++++++++++++++++++++-----------------------
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index a59d4fd..9e2f51a 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,44 +4,44 @@ volumes:
   mysql-data:
     driver: local
 services:
- mysqldb:
-   image: mysql
-   container_name: jackhammer-db
-   environment:
-     MYSQL_ROOT_PASSWORD: root
-     MYSQL_DATABASE: jackhammer_production
-   ports:
-     - "3306:3306"
-   volumes: 
-      - mysql-data:/usr/local/bin/mysql
-   restart: always
-   healthcheck:
-     test: "nc -z localhost 3306"
-     interval: 1s
-     retries: 120
- web:
-   build: ./web
-   volumes:
-     - '.:/jackhammer'
-   ports:
-     - "5000:3000"
-   command: bash -c "bundle exec sidekiq -C config/sidekiq.yml -d && bundle exec puma -e production -b tcp://0.0.0.0:3000"
-   environment:
-     - REDIS_URL=redis://redis:6379
-     - SECRET_KEY_BASE=454ab84a2554a5e715db90c7560a06d8a20811d614e7313de05495ecdeac9614c4c3d263df1a5892b92d6c32ea06d4defbd2492c598e8295f89b8b316db25842
-     - RAILS_SERVE_STATIC_FILES=true
-     - RAILS_ENV=production
-     - MYSQL_DB=jackhammer_production
-     - MYSQL_HOST=mysqldb
-     - MYSQL_USER=root
-     - MYSQL_PASSWORD=root
-   links:
-     - mysqldb:mysqldb
-     - redis:redis
-   depends_on:
-     - mysqldb
-     - redis
- redis:
-   image: redis
-   ports:
-     - "6379"
+  mysqldb:
+    image: mysql
+    container_name: jackhammer-db
+    environment:
+      MYSQL_ROOT_PASSWORD: root
+      MYSQL_DATABASE: jackhammer_production
+    ports:
+      - "3306:3306"
+    volumes: 
+       - mysql-data:/usr/local/bin/mysql
+    restart: always
+    healthcheck:
+      test: "nc -z localhost 3306"
+      interval: 1s
+      retries: 120
+  web:
+    build: ./web
+    volumes:
+      - '.:/jackhammer'
+    ports:
+      - "5000:3000"
+    command: bash -c "bundle exec sidekiq -C config/sidekiq.yml -d && bundle exec puma -e production -b tcp://0.0.0.0:3000"
+    environment:
+      - REDIS_URL=redis://redis:6379
+      - SECRET_KEY_BASE=454ab84a2554a5e715db90c7560a06d8a20811d614e7313de05495ecdeac9614c4c3d263df1a5892b92d6c32ea06d4defbd2492c598e8295f89b8b316db25842
+      - RAILS_SERVE_STATIC_FILES=true
+      - RAILS_ENV=production
+      - MYSQL_DB=jackhammer_production
+      - MYSQL_HOST=mysqldb
+      - MYSQL_USER=root
+      - MYSQL_PASSWORD=root
+    links:
+      - mysqldb:mysqldb
+      - redis:redis
+    depends_on:
+      - mysqldb
+      - redis
+  redis:
+    image: redis
+    ports:
+      - "6379"

From 5cd82c09191e048a4c48359e8f1b4d48d2fbc501 Mon Sep 17 00:00:00 2001
From: Daigo Sakamoto <daigo@treasure-data.com>
Date: Thu, 15 Jun 2017 12:23:38 +0900
Subject: [PATCH 2/6] remove unused volume

---
 docker-compose.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 9e2f51a..a7d5cd4 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,8 +1,4 @@
 version: '3'
-volumes:
-  # We'll define a volume that will store the data from the mysql databases:
-  mysql-data:
-    driver: local
 services:
   mysqldb:
     image: mysql
@@ -12,8 +8,6 @@ services:
       MYSQL_DATABASE: jackhammer_production
     ports:
       - "3306:3306"
-    volumes: 
-       - mysql-data:/usr/local/bin/mysql
     restart: always
     healthcheck:
       test: "nc -z localhost 3306"

From 481fea420ce92047df1d9aa5de317cadf7c42f34 Mon Sep 17 00:00:00 2001
From: Daigo Sakamoto <daigo@treasure-data.com>
Date: Thu, 15 Jun 2017 12:25:24 +0900
Subject: [PATCH 3/6] remove healthcheck

The command nc doesn't exists in mysql container.
So this does noting.
---
 docker-compose.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index a7d5cd4..05d9efa 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,10 +9,6 @@ services:
     ports:
       - "3306:3306"
     restart: always
-    healthcheck:
-      test: "nc -z localhost 3306"
-      interval: 1s
-      retries: 120
   web:
     build: ./web
     volumes:

From 69808e927d06ab9f188c8e47cd9ccbce70f1772b Mon Sep 17 00:00:00 2001
From: Daigo Sakamoto <daigo@treasure-data.com>
Date: Thu, 15 Jun 2017 12:27:33 +0900
Subject: [PATCH 4/6] remove auto restart

---
 docker-compose.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 05d9efa..015c6f9 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,7 +8,6 @@ services:
       MYSQL_DATABASE: jackhammer_production
     ports:
       - "3306:3306"
-    restart: always
   web:
     build: ./web
     volumes:

From cab647e54b382a84d2315699b8a727b24e666644 Mon Sep 17 00:00:00 2001
From: Daigo Sakamoto <daigo@treasure-data.com>
Date: Thu, 15 Jun 2017 12:44:37 +0900
Subject: [PATCH 5/6] add caution

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index cea2899..36c2c5f 100644
--- a/README.md
+++ b/README.md
@@ -101,7 +101,7 @@ sh ./docker-build.sh SingleUser
 do signup for access
 
 ## Restarting Jackhammer
-
+__Caution: This operation removes all data.__
 ```
 docker-compose stop
 docker-compose rm

From 8ddfccfed766177273aa8c241cf64899d567967d Mon Sep 17 00:00:00 2001
From: Daigo Sakamoto <daigo@treasure-data.com>
Date: Thu, 15 Jun 2017 14:02:51 +0900
Subject: [PATCH 6/6] remove execute permission from docker-compose.yml

---
 docker-compose.yml | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 docker-compose.yml

diff --git a/docker-compose.yml b/docker-compose.yml
old mode 100755
new mode 100644