From 9e2c70f7cdea579c420122e93be7b449ff871adb Mon Sep 17 00:00:00 2001 From: Collin Preston Date: Thu, 27 Jun 2024 10:10:37 -0400 Subject: [PATCH] Update postgres (#2240) * update * update * update * Address code review --- .github/workflows/ci.yml | 2 +- docker-compose.yml | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bd98dedc27..86f670098f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 diff --git a/docker-compose.yml b/docker-compose.yml index ebca63059b..ed2f0c3367 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -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' @@ -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