Skip to content

Commit

Permalink
build: rename docker compose files to match branches
Browse files Browse the repository at this point in the history
  • Loading branch information
spwoodcock committed Oct 24, 2023
1 parent 94562b7 commit 44548f3
Show file tree
Hide file tree
Showing 4 changed files with 73 additions and 2 deletions.
3 changes: 3 additions & 0 deletions docker-compose.ssl.yml → docker-compose.development.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
3 changes: 3 additions & 0 deletions docker-compose.ssl-ext.yml → docker-compose.main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
65 changes: 65 additions & 0 deletions docker-compose.staging.yml
Original file line number Diff line number Diff line change
@@ -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 <https:#www.gnu.org/licenses/>.
#

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
4 changes: 2 additions & 2 deletions docs/dev/Production.md
Original file line number Diff line number Diff line change
Expand Up @@ -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!
Expand Down

0 comments on commit 44548f3

Please sign in to comment.