Skip to content

Commit 3d3f86d

Browse files
ref: fix gunicorn and taskfile cleanup
1 parent f232449 commit 3d3f86d

File tree

3 files changed

+12
-8
lines changed

3 files changed

+12
-8
lines changed

Taskfile.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,33 +26,33 @@ tasks:
2626
format-python:
2727
desc: "Format python code"
2828
cmds:
29-
- docker exec assetsubuntucom-app-1 yarn format-python
29+
- docker compose run --rm --no-deps --entrypoint "" app yarn format-python
3030

3131
lint:
3232
desc: "Run code linters"
3333
cmds:
34-
- docker exec assetsubuntucom-app-1 yarn lint
34+
- docker compose run --rm --no-deps --entrypoint "" app yarn lint
3535

3636
test-python:
3737
desc: "Run tests"
3838
cmds:
39-
- docker exec assetsubuntucom-app-1 yarn test-python
39+
- docker compose run --rm --no-deps --entrypoint "" app yarn test-python
4040

4141
test-e2e:
42-
desc: "Run end-to-end tests"
42+
desc: "Run playwright e2e tests. This requires the app server to be running, so make sure to run `task` first."
4343
cmds:
4444
- docker exec assetsubuntucom-app-1 yarn playwright install
4545
- docker exec assetsubuntucom-app-1 yarn test-e2e
4646

4747
build:
4848
desc: "Build the project"
4949
cmds:
50-
- docker exec assetsubuntucom-app-1 yarn build
50+
- docker compose run --rm --no-deps --entrypoint "" app yarn build
5151

5252
watch:
5353
desc: "Watch the project"
5454
cmds:
55-
- docker exec assetsubuntucom-app-1 yarn watch
55+
- docker compose run --rm --no-deps --entrypoint "" app yarn watch
5656

5757
test:
5858
desc: "Run all tests"

docker-compose.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,20 @@ services:
2727
- path: .env.local
2828
required: false
2929
ports:
30-
- "${PORT}:80"
30+
- "${PORT}:${PORT}"
3131
volumes:
3232
- .:/srv
3333
- /srv/.venv
34+
- /srv/node_modules
35+
command: ["yarn", "start"]
36+
entrypoint: []
3437
depends_on:
3538
postgres:
3639
condition: service_healthy
3740
swift:
3841
condition: service_started
3942
healthcheck:
40-
test: ["CMD", "curl", "-f", "http://localhost:80/manager"]
43+
test: ["CMD", "curl", "-f", "http://localhost:${PORT}/manager"]
4144
interval: 5s
4245
timeout: 5s
4346
retries: 30

requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ Pillow==10.4.0
99
psycopg2-binary==2.9.9
1010
python-keystoneclient==5.4.0
1111
python-swiftclient==4.6.0
12+
gunicorn<22.0.0
1213
requests==2.32.3
1314
scour==0.38.2
1415
sh==2.0.7

0 commit comments

Comments
 (0)