Skip to content

Commit

Permalink
GRN2-162: Revert to sqlite in docker compose (bigbluebutton#594)
Browse files Browse the repository at this point in the history
* Revert to sqlite

* Missed uncomenting sqlite volume

* Update sample.env
  • Loading branch information
shawn-higgins1 authored and jfederico committed Jun 28, 2019
1 parent 98f7afb commit e153528
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 24 deletions.
32 changes: 16 additions & 16 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ services:
env_file: .env
restart: unless-stopped
ports:
- 5000:80
- 127.0.0.1:5000:80
# When using external logging
# logging:
# driver: $LOG_DRIVER
Expand All @@ -18,19 +18,19 @@ services:
volumes:
- ./log:/usr/src/app/log
# When using sqlite3 as the database
# - ./db/production:/usr/src/app/db/production
- ./db/production:/usr/src/app/db/production
# When using postgresql as the database
links:
- db
db:
image: postgres:9.5
restart: on-failure
ports:
- 5432:5432
volumes:
- ./db/production:/var/lib/postgresql/data
environment:
- PGHOST=postgres
- PGDATABASE=postgres
- PGUSER=postgres
- PGPASSWORD=password
# links:
# - db
# db:
# image: postgres:9.5
# restart: on-failure
# ports:
# - 127.0.0.1:5432:5432
# volumes:
# - ./db/production:/var/lib/postgresql/data
# environment:
# - PGHOST=postgres
# - PGDATABASE=postgres
# - PGUSER=postgres
# - PGPASSWORD=password
15 changes: 7 additions & 8 deletions sample.env
Original file line number Diff line number Diff line change
Expand Up @@ -188,11 +188,10 @@ ENABLE_GOOGLE_CALENDAR_BUTTON=
# DB_USERNAME=postgres
# DB_PASSWORD=password
#
# Note that the example provided, works for deployments based on the docker-compose script wich is also included.
# But should you need to use an external Postgres server, the right values for HOST, USERNAME and PASSWORD should be applied.
#
DB_ADAPTER=postgresql
DB_HOST=db
DB_NAME=greenlight_production
DB_USERNAME=postgres
DB_PASSWORD=password
# For deployments based on the docker-compose script also included, the HOST should be set with the Docker container id.
#
# DB_ADAPTER=postgresql
# DB_HOST=db
# DB_NAME=greenlight_production
# DB_USERNAME=postgres
# DB_PASSWORD=password

0 comments on commit e153528

Please sign in to comment.