Skip to content

Commit 96a75b8

Browse files
committed
Updates for CI
1 parent e42aa29 commit 96a75b8

File tree

2 files changed

+7
-12
lines changed

2 files changed

+7
-12
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -116,22 +116,15 @@ jobs:
116116
cp wp1/credentials.py.e2e wp1/credentials.py
117117
cp wp1/credentials.py.dev.e2e wp1/credentials.py.dev
118118
119-
# This is the dev database, the dev redis, and the dev workers.
120-
# We don't technically need the last one.
119+
# This is the dev database, the dev redis, and the dev workers, as
120+
# well as the dev minio and the dev web server (Flask, port 5000).
121121
- name: Start Docker dev services
122122
run: docker compose -f docker-compose-dev.yml up -d --build
123123

124124
- name: Wait for Docker dev services to be up (30s)
125125
run: sleep 30s
126126
shell: bash
127127

128-
- name: Start web API server
129-
timeout-minutes: 2
130-
env:
131-
FLASK_APP: wp1.web.app
132-
FLASK_DEBUG: 1
133-
run: pipenv run gunicorn -b 0.0.0.0:5000 'wp1.web.app:create_app()' --log-file=output.log -D
134-
135128
- name: Build frontend server
136129
run: |
137130
cd wp1-frontend

wp1/credentials.py.e2e

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ CREDENTIALS = {
1717
'WP10DB': {
1818
'user': 'root',
1919
'password': 'wikipedia',
20-
'host': 'localhost',
21-
'port': 6300, # Specified in docker-compose-dev.yml
20+
'host': 'dev-database',
21+
'port': 3306,
2222
'db': 'enwp10_dev',
2323
},
2424

@@ -44,7 +44,9 @@ CREDENTIALS = {
4444
'CLIENT_URL': {
4545
'domains': ['http://localhost:5173'],
4646
'homepage': 'http://localhost:5173/#/',
47-
's3': 'https://org-kiwix-dev-wp1.s3.us-west-1.wasabisys.com',
47+
's3': 'http://minio:9000/',
48+
'backend': 'http://web-dev:5000',
49+
'backend_s3': 'http://minio:9000/org-kiwix-dev-wp1',
4850
},
4951
'MAILGUN': {
5052
'url': 'https://api.eu.mailgun.net/v3/mg.wp1.openzim.org/messages',

0 commit comments

Comments
 (0)