Skip to content

Commit

Permalink
[CE-401] Remove nginx from compose in dev mode
Browse files Browse the repository at this point in the history
Change-Id: I785dfb7ecafe547e12d3093278161cecec06ba96
Signed-off-by: Haitao Yue <hightall@me.com>
  • Loading branch information
hightall committed Jun 28, 2018
1 parent b814ccf commit 88dad37
Showing 1 changed file with 26 additions and 26 deletions.
52 changes: 26 additions & 26 deletions docker-compose-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,30 +15,30 @@
version: '3.2'
services:
# nginx as front end for the operator dashboard
nginx:
image: hyperledger/cello-nginx
hostname: cello-nginx
container_name: cello-nginx
restart: always
deploy:
resources:
limits:
cpus: '0.50'
memory: 2048M
reservations:
cpus: '0.10'
memory: 256M
volumes:
- ./nginx/nginx.conf:/etc/nginx/nginx.default.conf
#- /opt/cello/nginx/log/:/var/log/nginx/
ports:
- "80:80"
- "8080:8080"
environment:
- BACKEND=cello-operator-dashboard
- PORT=8080
- USERNAME=admin
- PASSWORD=pass
# nginx:
# image: hyperledger/cello-nginx
# hostname: cello-nginx
# container_name: cello-nginx
# restart: always
# deploy:
# resources:
# limits:
# cpus: '0.50'
# memory: 2048M
# reservations:
# cpus: '0.10'
# memory: 256M
# volumes:
# - ./nginx/nginx.conf:/etc/nginx/nginx.default.conf
# #- /opt/cello/nginx/log/:/var/log/nginx/
# ports:
# - "80:80"
# - "8080:8080"
# environment:
# - BACKEND=cello-operator-dashboard
# - PORT=8080
# - USERNAME=admin
# - PASSWORD=pass

# cello dashboard service for network operator
operator-dashboard:
Expand All @@ -54,8 +54,8 @@ services:
- STATIC_FOLDER=$STATIC_FOLDER
- TEMPLATE_FOLDER=$TEMPLATE_FOLDER
- ENABLE_EMAIL_ACTIVE=$ENABLE_EMAIL_ACTIVE
expose:
- "8080"
ports:
- "8080:8080"
volumes: # This should be removed in product env
- ./src/agent/docker/_compose_files:/cello
- ./src:/app
Expand Down

0 comments on commit 88dad37

Please sign in to comment.