From 5ec6e4203c8c691da384a0103550edf176ce3dd0 Mon Sep 17 00:00:00 2001
From: Gregory Igelmund <gregory.igelmund@gmail.com>
Date: Tue, 21 Mar 2017 13:08:30 +0100
Subject: [PATCH] Docker: Add commands for managing/interacting w/ docker in
 dev mode

scripts/docker-dev/up: starts a dev container.
scripts/docker-dev/down: stops a currently running dev container.
scripts/docker-dev/shell: attaches the tty to a running dev container
and allows interacting with the `mailpile` python cli.
---
 Dockerfile.dev           | 2 +-
 docker-compose.dev.yml   | 2 ++
 scripts/docker-dev/down  | 2 ++
 scripts/docker-dev/shell | 9 +++++++++
 scripts/docker-dev/up    | 2 ++
 5 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100755 scripts/docker-dev/down
 create mode 100755 scripts/docker-dev/shell
 create mode 100755 scripts/docker-dev/up

diff --git a/Dockerfile.dev b/Dockerfile.dev
index acab521bc..c5839d0f4 100644
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -19,4 +19,4 @@ RUN pip install -r requirements-dev.txt
 
 RUN chmod +x /entrypoint.sh
 
-CMD ["./mp", "--www=0.0.0.0:33411", "--wait"]
+CMD ["./mp"]
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 5c5157a6e..48ec360f0 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -1,6 +1,8 @@
 version: '3.0'
 services:
   mailpile_dev:
+    tty: true
+    stdin_open: true
     container_name: mailpile_dev
     build:
       context: .
diff --git a/scripts/docker-dev/down b/scripts/docker-dev/down
new file mode 100755
index 000000000..b29fad83a
--- /dev/null
+++ b/scripts/docker-dev/down
@@ -0,0 +1,2 @@
+#!/bin/bash
+docker-compose -f docker-compose.dev.yml down
diff --git a/scripts/docker-dev/shell b/scripts/docker-dev/shell
new file mode 100755
index 000000000..04ee1972c
--- /dev/null
+++ b/scripts/docker-dev/shell
@@ -0,0 +1,9 @@
+#!/bin/bash
+CONTAINER_NAME=mailpile_dev
+CONTAINER_ID=$(docker ps --filter "name=${CONTAINER_NAME}" --quiet)
+if [[ ! -z  $CONTAINER_ID ]]; then
+  echo "Connecting to docker container ${CONTAINER_NAME}:${CONTAINER_ID}"
+  docker attach $CONTAINER_NAME
+else
+  echo "Docker container ${CONTAINER_NAME} does not seem to be running. Start it with './scripts/docker-dev/up'"
+fi
diff --git a/scripts/docker-dev/up b/scripts/docker-dev/up
new file mode 100755
index 000000000..e6bf7a4b8
--- /dev/null
+++ b/scripts/docker-dev/up
@@ -0,0 +1,2 @@
+#!/bin/bash
+docker-compose -f docker-compose.dev.yml up --build --remove-orphans