Merge pull request #5691 from consuldemocracy/update_docker_postgres
Use a maintained version of PostgreSQL in Docker
This commit is contained in:
6
.github/workflows/db_schema.yml
vendored
6
.github/workflows/db_schema.yml
vendored
@@ -15,15 +15,15 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
services:
|
||||
postgres:
|
||||
image: postgres:10.10
|
||||
image: postgres:13.16
|
||||
ports: ["5432:5432"]
|
||||
options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
|
||||
env:
|
||||
POSTGRES_USER: consul
|
||||
POSTGRES_PASSWORD: ""
|
||||
POSTGRES_PASSWORD: password
|
||||
env:
|
||||
PGUSER: consul
|
||||
POSTGRES_HOST: postgres
|
||||
PGPASSWORD: password
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: ruby/setup-ruby@v1
|
||||
|
||||
6
.github/workflows/tests.yml
vendored
6
.github/workflows/tests.yml
vendored
@@ -19,15 +19,15 @@ jobs:
|
||||
timeout-minutes: 60
|
||||
services:
|
||||
postgres:
|
||||
image: postgres:10.10
|
||||
image: postgres:13.16
|
||||
ports: ["5432:5432"]
|
||||
options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
|
||||
env:
|
||||
POSTGRES_USER: consul
|
||||
POSTGRES_PASSWORD: ""
|
||||
POSTGRES_PASSWORD: password
|
||||
env:
|
||||
PGUSER: consul
|
||||
POSTGRES_HOST: postgres
|
||||
PGPASSWORD: password
|
||||
RAILS_ENV: test
|
||||
strategy:
|
||||
fail-fast: false
|
||||
|
||||
@@ -6,13 +6,14 @@ tests:
|
||||
image: "ruby:3.2.5"
|
||||
stage: test
|
||||
services:
|
||||
- postgres:10.10
|
||||
- postgres:13.16
|
||||
cache:
|
||||
key: consul
|
||||
paths:
|
||||
- vendor/
|
||||
variables:
|
||||
POSTGRES_USER: consul
|
||||
POSTGRES_PASSWORD: password
|
||||
RAILS_ENV: test
|
||||
TEST_COVERAGE: 1
|
||||
parallel: 5
|
||||
|
||||
@@ -5,7 +5,7 @@ default: &default
|
||||
pool: 5
|
||||
schema_search_path: "public,shared_extensions"
|
||||
username: consul
|
||||
password:
|
||||
password: password
|
||||
|
||||
test:
|
||||
<<: *default
|
||||
|
||||
@@ -5,7 +5,7 @@ services:
|
||||
|
||||
# use the preferred version of the official Postgres image
|
||||
# see https://hub.docker.com/_/postgres/
|
||||
image: postgres:9.6.21
|
||||
image: postgres:13.16
|
||||
environment:
|
||||
- POSTGRES_PASSWORD=$POSTGRES_PASSWORD
|
||||
# persist the database between containers by storing it in a volume
|
||||
|
||||
Reference in New Issue
Block a user