From bb4af4f16f1d9b44d52d33e3151e19cec1f069ff Mon Sep 17 00:00:00 2001
From: Patrick Daly <pmdaly12@gmail.com>
Date: Fri, 23 Jul 2021 18:41:51 -0700
Subject: [PATCH] docker integrated with poetry and persistence fixed

---
 Dockerfile           |  3 ---
 docker-compose.yml   |  1 +
 pyproject.toml       |  3 ++-
 run.sh               |  6 ------
 scripts/dev_tools.py | 12 ++++++++----
 5 files changed, 11 insertions(+), 14 deletions(-)
 delete mode 100755 run.sh

diff --git a/Dockerfile b/Dockerfile
index 62fc278..9223c67 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,9 +11,6 @@ WORKDIR /app/
 
 RUN poetry install
 
-# easy bruh...
-#ENTRYPOINT ["./run.sh"]
-
 # easter eggs 😝
 RUN echo "PS1='🕵️:\[\033[1;36m\]\h \[\033[1;34m\]\W\[\033[0;35m\]\[\033[1;36m\]$ \[\033[0m\]'" >> ~/.bashrc
 
diff --git a/docker-compose.yml b/docker-compose.yml
index a82f926..28500be 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,6 +7,7 @@ services:
       - .env
     volumes:
       - .:/app
+    tty: true
 
   db:
     image: postgres:12
diff --git a/pyproject.toml b/pyproject.toml
index 13ac3a8..eec274a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -34,7 +34,8 @@ mypy = 'scripts.dev_tools:mypy'
 black = 'scripts.dev_tools:black'
 blackcheck = 'scripts.dev_tools:blackcheck'
 start = 'scripts.dev_tools:start'
-start_it = 'scripts.dev_tools:start_it'
+start_background = 'scripts.dev_tools:start_background'
+stop = 'scripts.dev_tools:stop'
 build = 'scripts.dev_tools:build'
 
 [tool.black]
diff --git a/run.sh b/run.sh
deleted file mode 100755
index 434b3e6..0000000
--- a/run.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-# Source: https://github.com/docker/compose/issues/1926#issuecomment-505294443
-
-# Ah, ha, ha, ha, stayin' alive...
-while :; do :; done & kill -STOP $! && wait $!
diff --git a/scripts/dev_tools.py b/scripts/dev_tools.py
index a3be9ef..b2e4484 100644
--- a/scripts/dev_tools.py
+++ b/scripts/dev_tools.py
@@ -22,10 +22,14 @@ def blackcheck():
     check_call(['black', '--diff', '--color', '.'])
 
 def start():
-    check_call(['docker', 'run', 'mev-inspect'])
+    check_call(['docker', 'compose', 'up'])
+
+def start_background():
+    check_call(['docker', 'compose', 'up', '-d'])
+
+def stop():
+    check_call(['docker', 'compose', 'down'])
 
 def build():
-    check_call(['docker', 'build', '-t', 'mev-inspect', '.'])
+    check_call(['docker', 'compose', 'build'])
 
-def start_it():
-    check_call(['docker', 'run', 'mev-inspect'])