Skip to content

Commit 9c40b93

Browse files
authored
chore: update remaining config files to point to new db image
1 parent 2d08375 commit 9c40b93

7 files changed

Lines changed: 8 additions & 257 deletions

File tree

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ jobs:
125125

126126
services:
127127
db:
128-
image: ghcr.io/ietf-tools/datatracker-db-pg:latest
128+
image: ghcr.io/ietf-tools/datatracker-db:latest
129129

130130
steps:
131131
- uses: actions/checkout@v3
@@ -227,7 +227,7 @@ jobs:
227227

228228
services:
229229
db:
230-
image: ghcr.io/ietf-tools/datatracker-db-pg:latest
230+
image: ghcr.io/ietf-tools/datatracker-db:latest
231231

232232
steps:
233233
- uses: actions/checkout@v3

.github/workflows/ci-run-tests.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ on:
44
pull_request:
55
branches:
66
- 'main'
7-
- 'feat/postgres'
87
paths:
98
- 'client/**'
109
- 'ietf/**'
@@ -20,7 +19,7 @@ jobs:
2019

2120
services:
2221
db:
23-
image: ghcr.io/ietf-tools/datatracker-db-pg:latest
22+
image: ghcr.io/ietf-tools/datatracker-db:latest
2423

2524
steps:
2625
- uses: actions/checkout@v3

.github/workflows/dev-db-nightly.yml

Lines changed: 0 additions & 230 deletions
This file was deleted.

dev/diff/settings_local.py

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,11 @@
88
DATABASES = {
99
'default': {
1010
'HOST': '__DBHOST__',
11-
'PORT': 3306,
12-
'NAME': 'ietf_utf8',
13-
'ENGINE': 'django.db.backends.mysql',
11+
'PORT': 5432,
12+
'NAME': 'ietf',
13+
'ENGINE': 'django.db.backends.postgresql_psycopg2',
1414
'USER': 'django',
1515
'PASSWORD': 'RkTkDPFnKpko',
16-
'OPTIONS': {
17-
'sql_mode': 'STRICT_TRANS_TABLES',
18-
'init_command': 'SET storage_engine=InnoDB; SET names "utf8"',
19-
},
2016
},
2117
}
2218

dev/tests/debug.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ docker compose -p dtdebug cp ../../. app:/__w/datatracker/datatracker/
1818
echo "Run prepare script..."
1919
docker compose -p dtdebug exec app chmod +x ./dev/tests/prepare.sh
2020
docker compose -p dtdebug exec app sh ./dev/tests/prepare.sh
21-
docker compose -p dtdebug exec app /usr/local/bin/wait-for db:3306 -- echo "DB ready"
21+
docker compose -p dtdebug exec app /usr/local/bin/wait-for db:5432 -- echo "DB ready"
2222
echo "================================================================="
2323
echo "Launching zsh terminal:"
2424
docker compose -p dtdebug exec app /bin/zsh

dev/tests/docker-compose.debug.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ services:
1717
GITHUB_ACTIONS: 'true'
1818
HOME: /github/home
1919
db:
20-
image: ghcr.io/ietf-tools/datatracker-db-pg:latest
20+
image: ghcr.io/ietf-tools/datatracker-db:latest
2121
restart: unless-stopped
2222
volumes:
2323
- postgresdb-data:/var/lib/postgresql/data

docker/configs/settings_mysqldb.py

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)