Skip to content

Commit

Permalink
Install mongo-2.6 for router & router-api
Browse files Browse the repository at this point in the history
The route reloading mechanism in router relies on the output format of
`rs.status()`, which is different in 3.6.  Since we're using mongo 2.x
in production, downgrade the version used for router.
  • Loading branch information
barrucadu committed Jun 9, 2021
1 parent 6e01f36 commit 5154db8
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 10 deletions.
7 changes: 7 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ volumes:
postgres-9.6:
mysql-5.5:
mongo-3.6:
mongo-2.6:
go:
elasticsearch-6:
elasticsearch-7:
Expand All @@ -29,6 +30,12 @@ services:
- "27017:27017"
- "28017:28017"

mongo-2.6:
image: mongo:2.6
volumes:
- mongo-2.6:/data/db
command: ["--replSet", "mongo-replica-set"]

mysql-5.5:
image: mysql:5.5.58
volumes:
Expand Down
10 changes: 5 additions & 5 deletions projects/router-api/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,19 @@ services:
router-api-lite:
<<: *router-api
depends_on:
- mongo-3.6
- mongo-2.6
environment:
MONGODB_URI: "mongodb://mongo-3.6/router"
TEST_MONGODB_URI: "mongodb://mongo-3.6/router-test"
MONGODB_URI: "mongodb://mongo-2.6/router"
TEST_MONGODB_URI: "mongodb://mongo-2.6/router-test"

router-api-app: &router-api-app
<<: *router-api
depends_on:
- mongo-3.6
- mongo-2.6
- router-app
- nginx-proxy
environment:
MONGODB_URI: "mongodb://mongo-3.6/router"
MONGODB_URI: "mongodb://mongo-2.6/router"
VIRTUAL_HOST: router-api.dev.gov.uk
BINDING: 0.0.0.0
expose:
Expand Down
2 changes: 2 additions & 0 deletions projects/router/Makefile
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
router: clone-router
$(GOVUK_DOCKER) up -d mongo-2.6
$(GOVUK_DOCKER) exec mongo-2.6 mongo --eval "rs.initiate()"
$(GOVUK_DOCKER) run $@-lite make build
10 changes: 5 additions & 5 deletions projects/router/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,25 @@ services:
router-lite:
<<: *router
depends_on:
- mongo-3.6
- mongo-2.6
environment:
BINARY: /go/src/github.com/alphagov/router/router
DEBUG: "true"
ROUTER_MONGO_URL: mongo-3.6
ROUTER_MONGO_URL: mongo-2.6
ROUTER_MONGO_DB: router

router-app: &router-app
<<: *router
depends_on:
- mongo-3.6
- mongo-2.6
- nginx-proxy
expose:
- "8080"
- "3055"
environment:
VIRTUAL_HOST: router.dev.gov.uk,www.dev.gov.uk,www-origin.dev.gov.uk
VIRTUAL_PORT: 8080
ROUTER_MONGO_URL: mongo-3.6
ROUTER_MONGO_URL: mongo-2.6
ROUTER_MONGO_DB: router
ROUTER_APIADDR: :3055
ROUTER_BACKEND_HEADER_TIMEOUT: 60s
Expand All @@ -44,7 +44,7 @@ services:
environment:
VIRTUAL_HOST: draft-router.dev.gov.uk,draft-origin.dev.gov.uk
VIRTUAL_PORT: 8080
ROUTER_MONGO_URL: mongo-3.6
ROUTER_MONGO_URL: mongo-2.6
ROUTER_MONGO_DB: draft-router
ROUTER_APIADDR: :3055
ROUTER_BACKEND_HEADER_TIMEOUT: 60s

0 comments on commit 5154db8

Please sign in to comment.