Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions .devcontainer/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: "3.8"

services:
app:
hostname: devcontainer
Expand Down Expand Up @@ -35,16 +33,16 @@ services:
- selenium-chrome

db:
image: postgis/postgis:14-3.5-alpine
image: postgis/postgis:17-3.5-alpine
restart: unless-stopped
volumes:
- postgres_data:/var/lib/postgresql/data
- postgres_data_17:/var/lib/postgresql/data
environment:
POSTGRES_USER: postgres
POSTGRES_DB: postgres
POSTGRES_PASSWORD: postgres
ports:
- "5432:5432"
- "5437:5432"

redis:
# Azure currenty runs redis 6.0
Expand All @@ -71,7 +69,7 @@ services:

volumes:
# Postgres data directory
postgres_data:
postgres_data_17:
# Caches for Bundler/NPM/Yarn-installed dependencies to persist across rebuilds and install faster
bundle:
node_modules:
Expand Down
1 change: 1 addition & 0 deletions .env.development
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
ATS_API_CLIENT_TESTING_API_KEY=a94272cb45956f2116f3026847ebb640dc60a2fe
DATABASE_URL=postgis://postgres:postgres@localhost:5437
DFE_SIGN_IN_REDIRECT_URL=http://localhost:3000/auth/dfe/callback
DISABLE_EMAILS=false
DOMAIN=localhost:3000
Expand Down
1 change: 1 addition & 0 deletions .env.test
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
APP_ROLE=test
AUTHENTICATION_FALLBACK=false
AUTHENTICATION_FALLBACK_FOR_JOBSEEKERS=false
DATABASE_URL=postgis://postgres:postgres@localhost:5437
DFE_SIGN_IN_PUBLISHER_ROLE_ID=test-publisher-role-id
DFE_SIGN_IN_PASSWORD=test-password
DFE_SIGN_IN_SERVICE_ID=test-service-id
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build_and_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,17 +37,17 @@ jobs:

env:
RAILS_ENV: test
DATABASE_URL: postgis://postgres:postgres@localhost:5432/tvs_test
DATABASE_URL: postgis://postgres:postgres@localhost:5437/tvs_test
RAILS_MASTER_KEY: ${{ secrets.RAILS_MASTER_KEY }}

services:
postgres:
image: postgis/postgis:14-3.5-alpine
image: postgis/postgis:17-3.5-alpine
env:
POSTGRES_USER: postgres
POSTGRES_PASSWORD: postgres
ports:
- 5432:5432
- 5437:5432
options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5

steps:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,18 +72,18 @@ jobs:
runs-on: ubuntu-latest

env:
DATABASE_URL: postgis://postgres:postgres@localhost:5432/tvs_test
DATABASE_URL: postgis://postgres:postgres@localhost:5437/tvs_test
RAILS_ENV: test
RAILS_MASTER_KEY: ${{ secrets.RAILS_MASTER_KEY }}

services:
postgres:
image: postgis/postgis:14-3.5-alpine
image: postgis/postgis:17-3.5-alpine
env:
POSTGRES_USER: postgres
POSTGRES_PASSWORD: postgres
ports:
- 5432:5432
- 5437:5432
options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5

steps:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,18 @@ jobs:
fail-fast: false

env:
DATABASE_URL: postgis://postgres:postgres@localhost:5432
DATABASE_URL: postgis://postgres:postgres@localhost:5437
RAILS_ENV: test
RAILS_MASTER_KEY: ${{ secrets.RAILS_MASTER_KEY }}

services:
postgres:
image: postgis/postgis:14-3.5-alpine
image: postgis/postgis:17-3.5-alpine
env:
POSTGRES_USER: postgres
POSTGRES_PASSWORD: postgres
ports:
- 5432:5432
- 5437:5432
options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5

steps:
Expand Down
2 changes: 1 addition & 1 deletion config/database.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ default: &default
encoding: unicode
# AKS DATABASE_URL will start with `postgres://`, which overrides the postgis adapter
# so we need to replace `postgres` if it occurs at the beginning of DATABASE_URL
url: <%= ENV.fetch('DATABASE_URL', 'postgis://postgres@localhost:5432').sub(/^postgres/, "postgis") %>
url: <%= ENV.fetch('DATABASE_URL', 'postgis://postgres@localhost:5437').sub(/^postgres/, "postgis") %>
pool: <%= Integer(ENV.fetch('RAILS_MAX_THREADS') { 5 }) %>

development:
Expand Down
4 changes: 2 additions & 2 deletions terraform/app/modules/paas/aks_database.tf
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ module "postgres" {
azure_extensions = ["btree_gist", "pgcrypto", "fuzzystrmatch", "pg_trgm", "postgis"]
azure_sku_name = var.postgres_flexible_server_sku
azure_enable_high_availability = var.postgres_enable_high_availability
server_version = 14
server_version = 17
azure_maintenance_window = var.azure_maintenance_window
server_docker_image = "postgis/postgis:14-3.5"
server_docker_image = "postgis/postgis:17-3.5"
}
Loading