Skip to content

Commit

Permalink
Update postgres (#2240)
Browse files Browse the repository at this point in the history
* update

* update

* update

* Address code review
  • Loading branch information
collinpreston authored Jun 27, 2024
1 parent 348bec7 commit 9e2c70f
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:

services:
db:
image: postgres:11.6
image: postgres:15.7
# Health checks to wait until postgres has started
options: >-
--health-cmd pg_isready
Expand Down
10 changes: 7 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ x-environment:
NODE_ENV: 'development'
DEV_ENV: 'True' # necessary to have nginx connect to web container
SECRET_KEY: local_unsafe_key
DATABASE_URL: postgres://postgres@db:5432/postgres
DATABASE_URL: postgres://postgres:postgres@db:5432/postgres
MITX_ONLINE_BASE_URL: ${MITX_ONLINE_BASE_URL:-http://mitxonline.odl.local:8013}
MITX_ONLINE_SECURE_SSL_REDIRECT: 'False'
MITX_ONLINE_DB_DISABLE_SSL: 'True'
Expand All @@ -18,16 +18,20 @@ x-environment:
DOCKER_HOST: ${DOCKER_HOST:-missing}

x-extra-hosts:
&default-extra-hosts
&default-extra-hosts # pragma: allowlist secret
- "edx.odl.local:${OPENEDX_IP:-172.22.0.1}"
- "host.docker.internal:host-gateway"
- "local.edly.io:host-gateway"

services:
db:
image: postgres:11.6
image: postgres:15.7
ports:
- "5432"
environment:
POSTGRES_PASSWORD: postgres # pragma: allowlist secret
volumes:
- db-data:/var/lib/postgresql/data

redis:
image: redis:6.0.5
Expand Down

0 comments on commit 9e2c70f

Please sign in to comment.