Skip to content

Commit

Permalink
change docker container names
Browse files Browse the repository at this point in the history
  • Loading branch information
dyuliu committed Nov 19, 2019
1 parent e0b814c commit 34fd209
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 10 deletions.
1 change: 0 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 0 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker-compose-db.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 5 additions & 7 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 34fd209

Please sign in to comment.