diff --git a/docker-compose.common.yml b/docker-compose.common.yml index 86ab9968..a887a6f6 100644 --- a/docker-compose.common.yml +++ b/docker-compose.common.yml @@ -1,5 +1,3 @@ -version: "3" - services: db: image: postgres:13 @@ -32,58 +30,6 @@ services: depends_on: - db - visitor: - build: . - command: sh -c " - wait-for-it web:8000 -- python manage_purldb.py seed && - python manage_purldb.py run_visit --ignore-robots --ignore-throttle" - env_file: - - docker_purldb.env - volumes: - - /etc/purldb/:/etc/purldb/ - profiles: - - visit_and_map - depends_on: - - db - - web # Ensure that potential db migrations run first - - mapper: - build: . - command: wait-for-it web:8000 -- python manage_purldb.py run_map - env_file: - - docker_purldb.env - volumes: - - /etc/purldb/:/etc/purldb/ - profiles: - - visit_and_map - depends_on: - - db - - web # Ensure that potential db migrations run first - - clearsync: - build: . - command: wait-for-it web:8000 -- clearsync --save-to-db --verbose -n 3 - env_file: - - docker_purldb.env - volumes: - - /etc/purldb/:/etc/purldb/ - profiles: - - clearsync - depends_on: - - db - - web # Ensure that potential db migrations run first - - clearindex: - build: . - command: wait-for-it web:8000 -- python manage_purldb.py run_clearindex - env_file: - - docker_purldb.env - profiles: - - clearsync - depends_on: - - db - - web # Ensure that potential db migrations run first - priority_queue: build: . command: wait-for-it web:8000 -- python manage_purldb.py priority_queue diff --git a/docker-compose.matchcodeio.yml b/docker-compose.matchcodeio.yml index dedcc8c8..210ec3b4 100644 --- a/docker-compose.matchcodeio.yml +++ b/docker-compose.matchcodeio.yml @@ -1,5 +1,3 @@ -version: "3" - services: matchcodeio_db: image: postgres:13 diff --git a/docker-compose.miners.yml b/docker-compose.miners.yml new file mode 100644 index 00000000..ba33ccde --- /dev/null +++ b/docker-compose.miners.yml @@ -0,0 +1,55 @@ +include: + - docker-compose.common.yml + +services: + visitor: + build: . + command: sh -c " + wait-for-it web:8000 -- python manage_purldb.py seed && + python manage_purldb.py run_visit --ignore-robots --ignore-throttle" + env_file: + - docker_purldb.env + volumes: + - /etc/purldb/:/etc/purldb/ + profiles: + - visit_and_map + depends_on: + - db + - web # Ensure that potential db migrations run first + + mapper: + build: . + command: wait-for-it web:8000 -- python manage_purldb.py run_map + env_file: + - docker_purldb.env + volumes: + - /etc/purldb/:/etc/purldb/ + profiles: + - visit_and_map + depends_on: + - db + - web # Ensure that potential db migrations run first + + clearsync: + build: . + command: wait-for-it web:8000 -- clearsync --save-to-db --verbose -n 3 + env_file: + - docker_purldb.env + volumes: + - /etc/purldb/:/etc/purldb/ + profiles: + - clearsync + depends_on: + - db + - web # Ensure that potential db migrations run first + + clearindex: + build: . + command: wait-for-it web:8000 -- python manage_purldb.py run_clearindex + env_file: + - docker_purldb.env + profiles: + - clearsync + depends_on: + - db + - web # Ensure that potential db migrations run first diff --git a/docker-compose.yml b/docker-compose.yml index ed5744f3..01bfbed3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,3 @@ -version: "3.7" - include: - docker-compose.common.yml