Adds a docker-compose file, fixes admin function
This commit is contained in:
28
docker-compose.yml
Normal file
28
docker-compose.yml
Normal file
@@ -0,0 +1,28 @@
|
||||
version : '2'
|
||||
services:
|
||||
mongo:
|
||||
image: patrickjmcd/mongodb-server
|
||||
ports:
|
||||
- "27017:27017"
|
||||
networks:
|
||||
poc:
|
||||
ipv4_address: 10.10.10.10
|
||||
www:
|
||||
image: patrickjmcd/poc-java-www
|
||||
ports:
|
||||
- "8080:6543"
|
||||
networks:
|
||||
- poc
|
||||
depends_on:
|
||||
- mongo
|
||||
|
||||
|
||||
networks:
|
||||
poc:
|
||||
driver: bridge
|
||||
driver_opts:
|
||||
com.docker.network.enable_ipv4: "true"
|
||||
ipam:
|
||||
driver: default
|
||||
config:
|
||||
- subnet: 10.10.10.0/24
|
||||
@@ -1,7 +0,0 @@
|
||||
from pyramid.view import view_config
|
||||
|
||||
|
||||
@view_config(route_name="admin", renderer="templates/admin.jinja2", permission="edit")
|
||||
def admin_view(request):
|
||||
address = get_poc_address(request) or 'localhost'
|
||||
return {'navgroup': 'admin', 'pocIPAddress': address}
|
||||
@@ -10,6 +10,12 @@ def get_poc_address(request):
|
||||
return address
|
||||
|
||||
|
||||
@view_config(route_name="admin", renderer="templates/admin.jinja2", permission="edit")
|
||||
def admin_view(request):
|
||||
address = get_poc_address(request) or 'localhost'
|
||||
return {'navgroup': 'admin', 'pocIPAddress': address}
|
||||
|
||||
|
||||
@view_config(route_name="poc_updateconfig_json", renderer="prettyjson", request_method='POST', permission="edit")
|
||||
def json_updateconfig(request):
|
||||
conv_to_float = [
|
||||
|
||||
@@ -20,14 +20,14 @@ poc.createUser({
|
||||
roles: [ { role: "readWrite", db: "poc" } ]
|
||||
});
|
||||
|
||||
// db.createUser({
|
||||
// user: "poc_www",
|
||||
// pwd: "HenryPump1903",
|
||||
// roles: [ { role: "readWrite", db: "poc" } ]
|
||||
// });
|
||||
//
|
||||
// db.createUser({
|
||||
// user: "poc_java",
|
||||
// pwd: "HenryPump@1903",
|
||||
// roles: [ { role: "readWrite", db: "poc" } ]
|
||||
// });
|
||||
db.createUser({
|
||||
user: "poc_www",
|
||||
pwd: "HenryPump1903",
|
||||
roles: [ { role: "readWrite", db: "poc" } ]
|
||||
});
|
||||
|
||||
db.createUser({
|
||||
user: "poc_java",
|
||||
pwd: "HenryPump@1903",
|
||||
roles: [ { role: "readWrite", db: "poc" } ]
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user