Skip to content

Commit e90e971

Browse files
authored
Chore: Move Docker related files for UI dev into web directory (#2590)
1 parent 0537bc3 commit e90e971

File tree

6 files changed

+13
-13
lines changed

6 files changed

+13
-13
lines changed

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,13 @@ api-docs-serve:
7070
python pdoc/cli.py
7171

7272
ui-up:
73-
docker-compose up --build -d && $(if $(shell which open), open http://localhost:8001, echo "Open http://localhost:8001 in your browser.")
73+
docker-compose -f ./web/docker-compose.yml up --build -d && $(if $(shell which open), open http://localhost:8001, echo "Open http://localhost:8001 in your browser.")
7474

7575
ui-down:
76-
docker-compose down
76+
docker-compose -f ./web/docker-compose.yml down
7777

7878
ui-build:
79-
docker-compose -f docker-compose.yml -f docker-compose.build.yml run app
79+
docker-compose -f ./web/docker-compose.yml -f ./web/docker-compose.build.yml run app
8080

8181
clean-build:
8282
rm -rf build/ && rm -rf dist/ && rm -rf *.egg-info
@@ -179,4 +179,4 @@ spark-pyspark-test:
179179
pytest -n auto -m "spark_pyspark"
180180

181181
trino-test:
182-
pytest -n auto -m "trino or trino_iceberg or trino_delta"
182+
pytest -n auto -m "trino or trino_iceberg or trino_delta"
File renamed without changes.
File renamed without changes.
File renamed without changes.
Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,24 @@ services:
55
container_name: generate-openapi-spec
66
working_dir: /sqlmesh
77
build:
8-
context: .
9-
dockerfile: Dockerfile.api
8+
context: ..
9+
dockerfile: web/Dockerfile.api
1010
command: python web/server/openapi.py
1111
volumes:
12-
- .:/sqlmesh
12+
- ..:/sqlmesh
1313

1414
app:
1515
image: tobiko-app
1616
container_name: tobiko-app
1717
build:
18-
context: .
19-
dockerfile: Dockerfile.app
18+
context: ..
19+
dockerfile: web/Dockerfile.app
2020
command: npm run dev -- --host 0.0.0.0 --port 8001
2121
working_dir: /app
2222
ports:
2323
- 8001:8001
2424
volumes:
25-
- ./web/client:/app
25+
- ../web/client:/app
2626
- /app/node_modules
2727
tty: true
2828
networks:
@@ -35,13 +35,13 @@ services:
3535
container_name: tobiko-api
3636
working_dir: /home
3737
build:
38-
context: .
39-
dockerfile: Dockerfile.api
38+
context: ..
39+
dockerfile: web/Dockerfile.api
4040
command: python -m uvicorn web.server.main:app --host 0.0.0.0 --port 8000 --reload --reload-dir /sqlmesh/web/server --reload-dir /sqlmesh/sqlmesh --timeout-keep-alive 300 --timeout-graceful-shutdown 1
4141
ports:
4242
- 8000:8000
4343
volumes:
44-
- .:/sqlmesh
44+
- ..:/sqlmesh
4545
networks:
4646
- tobiko-development
4747
environment:

0 commit comments

Comments
 (0)