Skip to content

Commit

Permalink
Merge pull request #163 from canonical/match-mongo-version-dev-env
Browse files Browse the repository at this point in the history
Use the same docker container version in docker-compose as production
  • Loading branch information
plars authored Nov 28, 2023
2 parents 05a38af + 439db33 commit 00fffd3
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
8 changes: 3 additions & 5 deletions server/devel/docker-compose.override.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
services:
mongo:
environment:
- MONGODB_USERNAME=testflinger
- MONGODB_PASSWORD=testflinger
- MONGODB_DATABASE=testflinger_db
- MONGODB_ROOT_PASSWORD=testflinger
- MONGO_INITDB_ROOT_USERNAME=testflinger
- MONGO_INITDB_ROOT_PASSWORD=testflinger

testflinger:
command: gunicorn --bind 0.0.0.0:5000 --reload testflinger:app
Expand All @@ -13,7 +11,7 @@ services:
- MONGODB_PASSWORD=testflinger
- MONGODB_DATABASE=testflinger_db
- MONGODB_HOST=mongo
- MONGODB_AUTH_SOURCE=testflinger_db
- MONGODB_AUTH_SOURCE=admin
volumes:
- .:/srv/testflinger

Expand Down
2 changes: 1 addition & 1 deletion server/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: '3.8'

services:
mongo:
image: bitnami/mongodb:latest
image: mongo:5
env_file:
- testflinger.env
ports:
Expand Down

0 comments on commit 00fffd3

Please sign in to comment.