Skip to content

Commit

Permalink
[CE-278] Disable nginx frontend
Browse files Browse the repository at this point in the history
The existing nginx config has bugs to block dashboard access.

The nginx way is not perfect for authentication.

We will implement membership management inside the flask framework.

Hence will disable nginx but allow users to adopt it manually.

Change-Id: I908bd034dd11b216795d2dbab50a1ba8276eb637
Signed-off-by: Baohua Yang <[email protected]>
  • Loading branch information
yeasy committed Feb 22, 2018
1 parent 389a8e3 commit fe513ab
Showing 1 changed file with 26 additions and 26 deletions.
52 changes: 26 additions & 26 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,28 +14,28 @@

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
ports:
- "80:80"
- "8080:8080"
environment:
- BACKEND=cello-operator-dashboard
- PORT=8080
- USERNAME=admin
- PASSWORD=pass
# nginx as front end for the services, disable now
#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
# 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 @@ -51,8 +51,8 @@ services:
- STATIC_FOLDER=$STATIC_FOLDER
- TEMPLATE_FOLDER=$TEMPLATE_FOLDER
- ENABLE_EMAIL_ACTIVE=$ENABLE_EMAIL_ACTIVE
expose:
- "8080"
ports:
- "8080:8080"

#TODO: need to follow other images to put at dockerhub
user-dashboard:
Expand Down Expand Up @@ -94,8 +94,8 @@ services:
- MONGO_DB=dev
- DEBUG=True # in debug mode, service will auto-restart
- LOG_LEVEL=DEBUG # what level log will be output
expose:
- "80"
ports:
- "80:80"

# cello watchdog service
watchdog:
Expand Down

0 comments on commit fe513ab

Please sign in to comment.