diff --git a/docker-compose.ssl.yml b/docker-compose.development.yml similarity index 99% rename from docker-compose.ssl.yml rename to docker-compose.development.yml index c6652a5493..b1dc11b53f 100644 --- a/docker-compose.ssl.yml +++ b/docker-compose.development.yml @@ -45,6 +45,9 @@ services: - fmtm-net restart: "unless-stopped" + certbot: + image: test + api: image: "ghcr.io/hotosm/fmtm/backend:${GIT_BRANCH}" container_name: fmtm-api-${GIT_BRANCH} diff --git a/docker-compose.ssl-ext.yml b/docker-compose.main.yml similarity index 98% rename from docker-compose.ssl-ext.yml rename to docker-compose.main.yml index 60789b858f..a031080eeb 100644 --- a/docker-compose.ssl-ext.yml +++ b/docker-compose.main.yml @@ -41,6 +41,9 @@ services: - fmtm-net restart: "unless-stopped" + certbot: + image: test + api: image: "ghcr.io/hotosm/fmtm/backend:${GIT_BRANCH}" container_name: fmtm-api-${GIT_BRANCH} diff --git a/docker-compose.staging.yml b/docker-compose.staging.yml new file mode 100644 index 0000000000..8567380725 --- /dev/null +++ b/docker-compose.staging.yml @@ -0,0 +1,65 @@ +# Copyright (c) 2022, 2023 Humanitarian OpenStreetMap Team +# This file is part of FMTM. +# +# FMTM is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# FMTM is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with FMTM. If not, see . +# + +version: "3" + +volumes: + fmtm_data: + fmtm_db_data: + fmtm_logs: + fmtm_images: + fmtm_tiles: + central_db_data: + certs: + +networks: + fmtm-net: + name: fmtm-${GIT_BRANCH} + +services: + proxy: + extends: + file: docker-compose.development.yml + service: proxy + certbot: + extends: + file: docker-compose.development.yml + service: certbot + api: + extends: + file: docker-compose.development.yml + service: api + central: + extends: + file: docker-compose.development.yml + service: central + s3: + extends: + file: docker-compose.development.yml + service: s3 + fmtm-db: + extends: + file: docker-compose.development.yml + service: fmtm-db + central-db: + extends: + file: docker-compose.development.yml + service: central-db + migrations: + extends: + file: docker-compose.development.yml + service: migrations diff --git a/docs/dev/Production.md b/docs/dev/Production.md index 5cdaf630bb..8d9482b469 100644 --- a/docs/dev/Production.md +++ b/docs/dev/Production.md @@ -86,9 +86,9 @@ that file to contain the needful (it should look like this): > Note: You must have an existing version of ODKCentral running, to provide the URL and credentials here. Run the production docker-compose config: -`docker compose -f docker-compose.prod.yml up -d` +`docker compose -f docker-compose.main.yml up -d` -> Note: The images should be built already on Quay. If they don't exist, use the `--build` flag during run. +> Note: The images should be built already on Github. With any luck, this will launch the docker container where the project runs, and you can access the working website from the domain name!