diff --git a/docker-compose.yml b/docker-compose.yml index b45bfdb..2467e28 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: "2.1" services: oddb: - image: simon987/od-database + build: . ports: - 5020:80 environment: @@ -54,28 +54,34 @@ services: - "WS_BUCKET_SECRET=changeme" ports: - 3020:3020 - tt_db: - image: postgres - volumes: - - ./tt_pg_data:/var/lib/postgresql/data - environment: - POSTGRES_USER: task_tracker - POSTGRES_PASSWORD: changeme - healthcheck: - test: ["CMD-SHELL", "pg_isready -U task_tracker"] - interval: 5s - timeout: 5s - retries: 5 tt: image: simon987/task_tracker volumes: - - ./tt_pg_data:/var/lib/postgresql/data - ./tt_config.yml:/root/config.yml ports: - 3010:80 depends_on: tt_db: condition: service_healthy + tt_web: + image: simon987/task_tracker_web + ports: + - 3011:80 + depends_on: + tt: + condition: service_started + tt_db: + image: postgres + volumes: + - ./tt_db_data:/var/lib/postgresql/data + environment: + - "POSTGRES_USER=task_tracker" + - "POSTGRES_PASSWORD=task_tracker" + healthcheck: + test: ["CMD-SHELL", "pg_isready -U task_tracker"] + interval: 3s + timeout: 2s + retries: 10 es: image: docker.elastic.co/elasticsearch/elasticsearch:7.5.2 environment: diff --git a/search/__pycache__/__init__.cpython-36.pyc b/search/__pycache__/__init__.cpython-36.pyc deleted file mode 100755 index b189e92..0000000 Binary files a/search/__pycache__/__init__.cpython-36.pyc and /dev/null differ diff --git a/search/__pycache__/__init__.cpython-37.pyc b/search/__pycache__/__init__.cpython-37.pyc deleted file mode 100644 index d9971d1..0000000 Binary files a/search/__pycache__/__init__.cpython-37.pyc and /dev/null differ diff --git a/search/__pycache__/filter.cpython-37.pyc b/search/__pycache__/filter.cpython-37.pyc deleted file mode 100644 index d1fd205..0000000 Binary files a/search/__pycache__/filter.cpython-37.pyc and /dev/null differ diff --git a/search/__pycache__/search.cpython-36 (ManjaroBox's conflicted copy 2018-09-03).pyc b/search/__pycache__/search.cpython-36 (ManjaroBox's conflicted copy 2018-09-03).pyc deleted file mode 100755 index abbaf41..0000000 Binary files a/search/__pycache__/search.cpython-36 (ManjaroBox's conflicted copy 2018-09-03).pyc and /dev/null differ diff --git a/search/__pycache__/search.cpython-36.pyc b/search/__pycache__/search.cpython-36.pyc deleted file mode 100755 index e2d5c4b..0000000 Binary files a/search/__pycache__/search.cpython-36.pyc and /dev/null differ diff --git a/search/__pycache__/search.cpython-37.pyc b/search/__pycache__/search.cpython-37.pyc deleted file mode 100644 index 9a682f7..0000000 Binary files a/search/__pycache__/search.cpython-37.pyc and /dev/null differ diff --git a/test/__pycache__/__init__.cpython-36.pyc b/test/__pycache__/__init__.cpython-36.pyc deleted file mode 100755 index 8afad41..0000000 Binary files a/test/__pycache__/__init__.cpython-36.pyc and /dev/null differ