From 34fd2094a2bbdca3d91fde7083b74c099e2bf67a Mon Sep 17 00:00:00 2001
From: dyuliu <ustdongyu@gmail.com>
Date: Tue, 19 Nov 2019 10:32:42 -0500
Subject: [PATCH] change docker container names

---
 Dockerfile            |  1 -
 Makefile              |  1 -
 docker-compose-db.yml |  2 +-
 docker-compose.yml    | 12 +++++-------
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c49918b..d4ec972 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -50,7 +50,6 @@ ADD . /mtv
 WORKDIR /mtv
 
 # install application packages for python and node
-RUN make install-theme
 RUN make install
 RUN cd ./client && npm install && npm run build:prod
 
diff --git a/Makefile b/Makefile
index b4b4514..2a4b4a8 100644
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,6 @@ install: clean-build clean-pyc clean-client ## install the packages for running
 .PHONY: install-develop
 install-develop: clean-build clean-pyc clean-client ## install the package in editable mode and dependencies for development
 	pip install -e .[dev]
-	# npm install --quiet -g gulp-cli
 	cd client && npm install
 
 .PHONY: install-theme
diff --git a/docker-compose-db.yml b/docker-compose-db.yml
index c264c28..1e11587 100644
--- a/docker-compose-db.yml
+++ b/docker-compose-db.yml
@@ -2,7 +2,7 @@ version: "3"
 services:
   db:
     image: mongo:4.0
-    container_name: mtv-db
+    container_name: mtv_db
     command: bash -c "mongod --bind_ip_all --port 27017 --logpath /mtv/log/db.log --fork && mongorestore --db mtv /mtv/data/mtv/"
     volumes:
       - ./db-instance/data:/mtv/data
diff --git a/docker-compose.yml b/docker-compose.yml
index 6439d9d..be4f89d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,25 +2,23 @@ version: "3"
 services:
   db:
     image: mongo:4.0
-    container_name: mtv-db
+    container_name: mtv_db
     ports:
       - "127.0.0.1:27018:27017"
-    # command: mongod --port 27017 --dbpath /mtv/db-instance/data --logpath /mtv/db-instance/log/db.log --fork
-    # command: bash -c "mongod --bind_ip_all --port 27017 --logpath /mtv/log/db.log --fork && tail -F xx"
-    # command: bash -c "mongod --bind_ip_all --port 27017 --logpath /mtv/log/db.log --fork && mongorestore --db mtv /mtv/dump/mtv/ && tail -F anything"
     command: bash -c "mongod --bind_ip_all --port 27017 --logpath /mtv/log/db.log --fork && tail -F anything"
     volumes:
       - ./db-instance/data:/mtv/data
       - ./db-instance/log:/mtv/log
       - ./db-instance/dump:/mtv/dump
-  web:
-    image: mtv
+  app:
+    image: dyuliu/mtv:latest
     # build: .
-    container_name: mtv
+    container_name: mtv_app
     depends_on:
       - db
     ports:
       - "3000:3000"
     command: mtv run --env production -v --docker
+    # command: bash -c "npm -C client run build:prod && mtv run --env production -v --docker"
     # volumes:
     #   - .:/mtv