diff --git a/components/entitiy_ident/entity_ident_service/Dockerfile b/components/entitiy_ident/entity_ident_service/Dockerfile index 531283d..d0b7375 100644 --- a/components/entitiy_ident/entity_ident_service/Dockerfile +++ b/components/entitiy_ident/entity_ident_service/Dockerfile @@ -2,7 +2,7 @@ FROM python:3.8-slim COPY . /app WORKDIR /app RUN pip install -r requirements.txt -ENV PORT 5000 -EXPOSE 5000 +ENV PORT 5002 +EXPOSE 5002 ENTRYPOINT [ "python" ] CMD [ "entity_ident_server.py" ] \ No newline at end of file diff --git a/components/entitiy_ident/entity_ident_service/entity_ident_server.py b/components/entitiy_ident/entity_ident_service/entity_ident_server.py index 60df14d..a87fd2f 100644 --- a/components/entitiy_ident/entity_ident_service/entity_ident_server.py +++ b/components/entitiy_ident/entity_ident_service/entity_ident_server.py @@ -67,4 +67,4 @@ def get_traffic_lights_geo(): if __name__ == '__main__': - app.run(host='0.0.0.0') + app.run('0.0.0.0', 5002) diff --git a/components/event_store/service/Dockerfile b/components/event_store/service/Dockerfile index e4ef42e..43bb7fe 100644 --- a/components/event_store/service/Dockerfile +++ b/components/event_store/service/Dockerfile @@ -3,7 +3,7 @@ COPY . /app WORKDIR /app RUN pip install -r requirements.txt RUN cd deps; ls; pip install dse-shared-libs-1.tar.gz; -ENV PORT 5000 -EXPOSE 5000 +ENV PORT 5001 +EXPOSE 5001 ENTRYPOINT [ "python" ] CMD [ "event_store_server.py" ] \ No newline at end of file diff --git a/components/event_store/service/event_store_server.py b/components/event_store/service/event_store_server.py index 2832f3a..6cbeba5 100644 --- a/components/event_store/service/event_store_server.py +++ b/components/event_store/service/event_store_server.py @@ -27,4 +27,4 @@ def home_page(): if __name__ == '__main__': el = EventLogger(redis) threading.Thread(target=el.setup_msq_queue).start() - threading.Thread(target=app.run).start() + threading.Thread(target=app.run, args=('0.0.0.0', 5001)).start() diff --git a/components/orchestration/orchestration_server.py b/components/orchestration/orchestration_server.py index e6c555e..bbd8045 100644 --- a/components/orchestration/orchestration_server.py +++ b/components/orchestration/orchestration_server.py @@ -24,4 +24,4 @@ def api2(): if __name__ == '__main__': orc = Orchestrator() threading.Thread(target=orc.setup_msg_queues).start() - threading.Thread(target=app.run).start() + threading.Thread(target=app.run, args=('0.0.0.0', 5003)).start() diff --git a/components/x_way/Dockerfile b/components/x_way/Dockerfile index 379f9e2..1b433c9 100644 --- a/components/x_way/Dockerfile +++ b/components/x_way/Dockerfile @@ -2,7 +2,7 @@ FROM python:3.8-slim COPY . /app WORKDIR /app RUN pip install -r requirements.txt -ENV PORT 5000 -EXPOSE 5000 +ENV PORT 5003 +EXPOSE 5003 ENTRYPOINT [ "python" ] CMD [ "x_way_server.py" ] \ No newline at end of file diff --git a/components/x_way/x_way_server.py b/components/x_way/x_way_server.py index 3dfc734..67dacf3 100644 --- a/components/x_way/x_way_server.py +++ b/components/x_way/x_way_server.py @@ -19,4 +19,4 @@ def api2(): if __name__ == '__main__': - app.run() + app.run('0.0.0.0', 5004) diff --git a/kubernetes/docker-compose.yml b/kubernetes/docker-compose.yml index 2fa271b..7a53095 100644 --- a/kubernetes/docker-compose.yml +++ b/kubernetes/docker-compose.yml @@ -7,36 +7,38 @@ services: dockerfile: Dockerfile expose: - 5672 + ports: + - 5672:5672 # make accessible from host for local testing redis: build: context: ../components/event_store/redis dockerfile: Dockerfile expose: - 6379 + ports: + - 6379:6379 mongo: build: context: ../components/entitiy_ident/mongo dockerfile: Dockerfile expose: - 27017 + ports: + - 27017:27017 ifeed: build: context: ../components/i_feed dockerfile: Dockerfile depends_on: - rabbitmq - orchestration: - build: - context: ../components/orchestration - dockerfile: Dockerfile - depends_on: - - rabbitmq eventstore: build: context: ../components/event_store/service dockerfile: Dockerfile expose: - - 5000 + - 5001 + ports: + - 5001:5001 depends_on: - redis - rabbitmq @@ -45,16 +47,30 @@ services: context: ../components/entitiy_ident/entity_ident_service dockerfile: Dockerfile expose: - - 5000 + - 5002 + ports: + - 5002:5002 depends_on: - mongo + orchestration: + build: + context: ../components/orchestration + dockerfile: Dockerfile + depends_on: + - rabbitmq + expose: + - 5003 + ports: + - 5003:5003 xway: build: context: ../components/x_way dockerfile: Dockerfile expose: - - 5000 + - 5004 + ports: + - 5004:5004 depends_on: - - entity_ident + - entityident - orchestration - eventstore \ No newline at end of file