From 4ffaa20e50440a4ed0a243176a5b3679fa5674dd Mon Sep 17 00:00:00 2001
From: im <poson_hemp@yahoo.co.jp>
Date: Thu, 12 Nov 2020 19:13:59 +0900
Subject: [PATCH 1/6] init PR


From 81e46fb9e301bdba7c14119616359b00283eb6cd Mon Sep 17 00:00:00 2001
From: im <poson_hemp@yahoo.co.jp>
Date: Thu, 12 Nov 2020 20:24:54 +0900
Subject: [PATCH 2/6] update about .git file

---
 .gitignore  | 3 +++
 db/.gitkeep | 0
 2 files changed, 3 insertions(+)
 delete mode 100644 db/.gitkeep

diff --git a/.gitignore b/.gitignore
index b6e4761..c68cec8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -127,3 +127,6 @@ dmypy.json
 
 # Pyre type checker
 .pyre/
+
+# Setting by User
+db/tmp
diff --git a/db/.gitkeep b/db/.gitkeep
deleted file mode 100644
index e69de29..0000000

From 89f7686a60dcd45d8a79f3eef24bd1d7d6dbb6f7 Mon Sep 17 00:00:00 2001
From: im <poson_hemp@yahoo.co.jp>
Date: Thu, 12 Nov 2020 20:32:33 +0900
Subject: [PATCH 3/6] update steps for DB container build

---
 .circleci/config.yml | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index ee7daed..b9dcf6c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -4,8 +4,6 @@ jobs:
     machine:
       image: ubuntu-1604:202007-01
 
-    working_directory: ~/app
-
     steps:
       - checkout
 
@@ -22,20 +20,17 @@ jobs:
             docker-compose build
 
       - run:
-          name: Up Docker container
+          name: Up Docker containers and Confirm logs
           command: |
             set -x
             docker-compose up -d
-            docker-compose run --rm app sh -c "python --version && poetry --version"
-
-      # - run:
-      #     name: Run Docker container
-      #     command: |
-      #       set -x
-      #       docker-compose up -d
-      #       sleep 10
-      #       docker ps -f status=running
-      #       docker-compose logs
+            docker-compose run --rm app bash -c "python --version && poetry --version"
+            docker-compose run --rm db bash -c "psql --version"
+            docker-compose exec db bash
+            exit
+            sleep 10
+            docker ps -f status=running
+            docker-compose logs
 
       - run:
           name: Run Pytest

From 4e658b82fe77457ecccc8806a6f4b8023b250549 Mon Sep 17 00:00:00 2001
From: im <poson_hemp@yahoo.co.jp>
Date: Thu, 12 Nov 2020 20:33:38 +0900
Subject: [PATCH 4/6] update: way to build DB container

---
 db/Dockerfile      |  3 +--
 docker-compose.yml | 20 +++++++++++---------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/db/Dockerfile b/db/Dockerfile
index 86e000f..08e46cb 100644
--- a/db/Dockerfile
+++ b/db/Dockerfile
@@ -1,4 +1,3 @@
 FROM postgres:12-alpine
 
-EXPOSE 5432
-CMD ["postgres"]
+ENV LANG ja_JP.utf8
diff --git a/docker-compose.yml b/docker-compose.yml
index 66fa880..faa2962 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,14 +1,5 @@
 version: "3"
 services:
-  postgres:
-    build: ./db
-    environment:
-      - POSTGRES_USER=postgres
-      - POSTGRES_PASSWORD=password
-    ports:
-      - "5432:5432"
-    volumes:
-      - ./db/data/postgres:/var/lib/postgresql/data
   app:
     build: ./app
     user: root
@@ -24,3 +15,14 @@ services:
         --allow-root
         --NotebookApp.token=''
         --no-browser
+  db:
+    build: ./db
+    environment:
+      - POSTGRES_USER=postgres
+      - POSTGRES_PASSWORD=password
+      - POSTGRES_DB=testdb
+    ports:
+      - "5432:5432"
+    volumes:
+      - ./db/tmp/postgres/data:/var/lib/postgresql/data
+    restart: always

From e96469c0301bce539c964663edb729e1ebc2f4a0 Mon Sep 17 00:00:00 2001
From: im <poson_hemp@yahoo.co.jp>
Date: Fri, 13 Nov 2020 06:25:19 +0900
Subject: [PATCH 5/6] fix flow: docker-compose exec db bash

---
 .circleci/config.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b9dcf6c..e5a2618 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -24,13 +24,12 @@ jobs:
           command: |
             set -x
             docker-compose up -d
+            sleep 5
+            docker ps -f status=running
+            docker-compose logs
             docker-compose run --rm app bash -c "python --version && poetry --version"
             docker-compose run --rm db bash -c "psql --version"
             docker-compose exec db bash
-            exit
-            sleep 10
-            docker ps -f status=running
-            docker-compose logs
 
       - run:
           name: Run Pytest

From 626ebbbb5b54127f798f71557b7f6475101474a1 Mon Sep 17 00:00:00 2001
From: im <poson_hemp@yahoo.co.jp>
Date: Fri, 13 Nov 2020 19:08:32 +0900
Subject: [PATCH 6/6] delete step 'docker-compose exec db bash'

---
 .circleci/config.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e5a2618..578ddbe 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -29,7 +29,6 @@ jobs:
             docker-compose logs
             docker-compose run --rm app bash -c "python --version && poetry --version"
             docker-compose run --rm db bash -c "psql --version"
-            docker-compose exec db bash
 
       - run:
           name: Run Pytest