Code Review
/
pti
/
o2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add get detail of a resource to API; remove the dependency of the domain in the view...
[pti/o2.git]
/
docker-compose.yml
diff --git
a/docker-compose.yml
b/docker-compose.yml
index
02190b2
..
552154d
100644
(file)
--- a/
docker-compose.yml
+++ b/
docker-compose.yml
@@
-6,7
+6,7
@@
services:
build:
context: .
dockerfile: Dockerfile.localtest
build:
context: .
dockerfile: Dockerfile.localtest
- image: o2imsdms
-image
+ image: o2imsdms
depends_on:
- postgres
- redis
depends_on:
- postgres
- redis
@@
-24,13
+24,14
@@
services:
- ./o2ims:/o2ims
- ./o2dms:/o2dms
- ./o2common:/o2common
- ./o2ims:/o2ims
- ./o2dms:/o2dms
- ./o2common:/o2common
+ - ./o2app:/o2app
- ./tests:/tests
entrypoint:
- /bin/sh
- ./tests:/tests
entrypoint:
- /bin/sh
- - /tests/o2
ims
-redis-entry.sh
+ - /tests/o2
app
-redis-entry.sh
api:
api:
- image: o2imsdms
-image
+ image: o2imsdms
depends_on:
- redis_pubsub
environment:
depends_on:
- redis_pubsub
environment:
@@
-39,7
+40,7
@@
services:
- API_HOST=api
- REDIS_HOST=redis
- PYTHONDONTWRITEBYTECODE=1
- API_HOST=api
- REDIS_HOST=redis
- PYTHONDONTWRITEBYTECODE=1
- - FLASK_APP=/o2
ims
/entrypoints/flask_application.py
+ - FLASK_APP=/o2
app
/entrypoints/flask_application.py
- FLASK_DEBUG=1
- PYTHONUNBUFFERED=1
- OS_AUTH_URL=${OS_AUTH_URL}
- FLASK_DEBUG=1
- PYTHONUNBUFFERED=1
- OS_AUTH_URL=${OS_AUTH_URL}
@@
-51,12
+52,11
@@
services:
- ./o2ims:/o2ims
- ./o2dms:/o2dms
- ./o2common:/o2common
- ./o2ims:/o2ims
- ./o2dms:/o2dms
- ./o2common:/o2common
+ - ./o2app:/o2app
- ./tests:/tests
entrypoint:
- ./tests:/tests
entrypoint:
- - flask
- - run
- - --host=0.0.0.0
- - --port=80
+ - /bin/sh
+ - /tests/o2app-api-entry.sh
ports:
- "5005:80"
ports:
- "5005:80"
@@
-64,10
+64,9
@@
services:
build:
context: .
dockerfile: Dockerfile.localtest
build:
context: .
dockerfile: Dockerfile.localtest
- image: o2imsdms
-image
+ image: o2imsdms
depends_on:
depends_on:
- - postgres
- - redis
+ - redis_pubsub
environment:
- DB_HOST=postgres
- DB_PASSWORD=o2ims123
environment:
- DB_HOST=postgres
- DB_PASSWORD=o2ims123
@@
-82,10
+81,11
@@
services:
- ./o2ims:/o2ims
- ./o2dms:/o2dms
- ./o2common:/o2common
- ./o2ims:/o2ims
- ./o2dms:/o2dms
- ./o2common:/o2common
+ - ./o2app:/o2app
- ./tests:/tests
entrypoint:
- /bin/sh
- ./tests:/tests
entrypoint:
- /bin/sh
- - /tests/o2
ims
-watcher-entry.sh
+ - /tests/o2
app
-watcher-entry.sh
postgres:
image: postgres:9.6
postgres:
image: postgres:9.6