Merge pull request #139 from HDI-Project/update

Merge Update to Milestone122

Author: dyuliu

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
 

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

README.md

@@ -6,7 +6,8 @@
 <!-- [![PyPI Shield](https://img.shields.io/pypi/v/mtv.svg)](https://pypi.python.org/pypi/mtv) -->
 [![Build Status](https://travis-ci.com/dyuliu/mtv.svg?branch=master)](https://travis-ci.com/dyuliu/mtv)
 [![Coverage Status](https://coveralls.io/repos/github/dyuliu/MTV/badge.svg)](https://coveralls.io/github/dyuliu/MTV)
-
+[![Github All Releases](https://img.shields.io/github/downloads/dyuliu/MTV/total)](https://github.com/dyuliu/MTV/releases)
+[![Docker Pulls](https://img.shields.io/docker/pulls/dyuliu/mtv)](https://hub.docker.com/r/dyuliu/mtv)
 
 # MTV
 
@@ -21,7 +22,6 @@ The Restful APIs documentation: http://45.77.5.58/apidoc/
 [The MIT License](https://github.com/HDI-Project/MTV/blob/master/LICENSE)
 
 
-
 ## Before You Begin
 
 Before you begin we recommend you read about the basic building blocks that assemble the **MTV**:

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

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