From 369b532333f9ee0ba34da5ca8b7e839fa899191d Mon Sep 17 00:00:00 2001
From: Yong Wen Chua <ida@yongwen.xyz>
Date: Thu, 11 Aug 2016 16:34:02 +0800
Subject: [PATCH] Improve Docker Image and `docker-compose.yml`

 - Use the non-`onbuild` variant of the python base image to better make use of Docker image caching
 - Update some volumes in `docker-compose.yml` for pogoweb
---
 Dockerfile         | 12 +++++++++---
 docker-compose.yml |  9 +++++----
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f98d5d6942..2520813273 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,7 @@
-FROM python:2.7-onbuild
+FROM python:2.7
+
+WORKDIR /usr/src/app
+VOLUME ["/usr/app/configs", "/usr/src/app/web"]
 
 ARG timezone=Etc/UTC
 RUN echo $timezone > /etc/timezone \
@@ -15,8 +18,11 @@ RUN cd /tmp && wget "http://pgoapi.com/pgoencrypt.tar.gz" \
     && cd /tmp \
     && rm -rf /tmp/pgoencrypt*
 
-VOLUME ["/usr/src/app/web"]
-
 ENV LD_LIBRARY_PATH /usr/src/app
 
+COPY requirements.txt /usr/src/app/
+RUN pip install --no-cache-dir -r requirements.txt
+
+COPY . /usr/src/app
+
 ENTRYPOINT ["python", "pokecli.py"]
diff --git a/docker-compose.yml b/docker-compose.yml
index 95a32f8ceb..d31830d401 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,7 +3,8 @@ services:
   bot1-pokego:
     build: .
     volumes:
-     - ./configs/config.json:/usr/src/app/configs/config.json
+     - ./configs:/usr/src/app/configs
+     - ./web:/usr/src/app/web
     stdin_open: true
     tty: true
   bot1-pokegoweb:
@@ -11,10 +12,10 @@ services:
     ports:
      - "8000:8000"
     volumes_from:
-     - bot1-pokego
+      - bot1-pokego
     volumes:
-     - ./configs/userdata.js:/usr/src/app/web/config/userdata.js
+      - ./configs:/usr/src/app/web/config
     working_dir: /usr/src/app/web
     command: bash -c "echo 'Serving HTTP on 0.0.0.0 port 8000' && python -m SimpleHTTPServer > /dev/null 2>&1"
     depends_on:
-     - bot1-pokego
\ No newline at end of file
+     - bot1-pokego