Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Task #5

Closed
wants to merge 12 commits into from
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# Tasking Manager

[![hotosm](https://dl.circleci.com/status-badge/img/gh/hotosm/tasking-manager/tree/develop.svg?style=shield)](https://dl.circleci.com/status-badge/redirect/gh/hotosm/tasking-manager/tree/develop)
[![TM Backend on Quay](https://quay.io/repository/hotosm/tasking-manager/status "Tasking Manager Backend Build")](https://quay.io/repository/hotosm/tasking-manager)
[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=hotosm_tasking-manager&metric=alert_status)](https://sonarcloud.io/dashboard?id=hotosm_tasking-manager)
Expand Down
Binary file added arch.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 10 additions & 1 deletion docker-compose.override.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,21 @@ services:
volumes:
- .:/usr/src/app

postgresql:
volumes:
- "postgresql-data:/var/lib/postgresql/data"

frontend:
build:
context: "."
dockerfile: "./scripts/docker/Dockerfile.frontend"
volumes:
- ".:/usr/src/app"
labels:
- traefik.http.routers.frontend.rule=Host(`localhost`) || Host(`127.0.0.1`)
- TM_APP_API_URL=https://tasks.smartcitiestransport.com/api
- traefik.http.routers.frontend.rule=Host(`localhost`, `tasks.smartcitiestransport.com`) || Host(`localhost`)
# - traefik.http.routers.frontend.rule=Host(`localhost`) || Host(`127.0.0.1`)
- traefik.http.services.frontend.loadbalancer.server.port=80

volumes:
postgresql-data:
6 changes: 4 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ services:
container_name: backend
restart: always
labels:
- traefik.http.routers.backend.rule=(Host(`127.0.0.1`) || Host(`localhost`)) && PathPrefix(`/api/`)
- traefik.http.routers.backend.rule=Host(`localhost`, `tasks.smartcitiestransport.com`) && PathPrefix(`/api/`)
# - traefik.http.routers.backend.rule=(Host(`127.0.0.1`) || Host(`localhost`)) && PathPrefix(`/api/`)
- traefik.http.services.backend.loadbalancer.server.port=5000

migration:
Expand All @@ -33,7 +34,8 @@ services:
networks:
- tm-web
labels:
- traefik.http.routers.frontend.rule=Host(`127.0.0.1`) || Host(`localhost`)
- traefik.http.routers.frontend.rule=Host(`localhost`, `tasks.smartcitiestransport.com`)
# - traefik.http.routers.frontend.rule=Host(`127.0.0.1`) || Host(`localhost`)
- traefik.http.services.frontend.loadbalancer.server.port=3000

postgresql:
Expand Down
Binary file added task_file.pdf
Binary file not shown.
Loading