From b6c9da9e6bee102f15b28f708b027405554b1d6e Mon Sep 17 00:00:00 2001 From: zwnk Date: Thu, 16 Jan 2025 21:04:17 -0300 Subject: [PATCH] lll --- .gitmodules | 6 ++++++ backend | 1 + docker-compose.yml | 12 ++++-------- frontend | 1 + 4 files changed, 12 insertions(+), 8 deletions(-) create mode 100644 .gitmodules create mode 160000 backend create mode 160000 frontend diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..64d1ddc --- /dev/null +++ b/.gitmodules @@ -0,0 +1,6 @@ +[submodule "frontend"] + path = frontend + url = git@git.impstyle.com:test/demo-frontend.git +[submodule "backend"] + path = backend + url = git@git.impstyle.com:test/demo-backend.git diff --git a/backend b/backend new file mode 160000 index 0000000..93c881c --- /dev/null +++ b/backend @@ -0,0 +1 @@ +Subproject commit 93c881c1fbee2d5029ed8f30ba8566b5a2f03dec diff --git a/docker-compose.yml b/docker-compose.yml index 3f51920..b4aa0bb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,5 @@ services: - db: + demo-db: image: postgres:13 volumes: - postgres_data:/var/lib/postgresql/data @@ -12,9 +12,7 @@ services: backend: build: - context: ${PWD}/../backend/ - # dockerfile: Dockerfile - # entrypoint: ["${PWD}/../backend/entrypoint.sh"] + context: ./backend/ command: sh -c "python manage.py migrate && python manage.py runserver 0.0.0.0:8000" ports: - "8000:8000" @@ -26,13 +24,11 @@ services: - DB_PORT=5432 - DEBUG=1 depends_on: - - db + - demo-db frontend: build: - context: ${PWD}/../frontend - # dockerfile: Dockerfile -# entrypoint: ["${PWD}/../frontend/entrypoint.sh"] + context: ./frontend command: sh -c "npm run dev -- --host 0.0.0.0" ports: - "5173:5173" diff --git a/frontend b/frontend new file mode 160000 index 0000000..ac58014 --- /dev/null +++ b/frontend @@ -0,0 +1 @@ +Subproject commit ac580147917e3da681ce2bf4975b6c97632bf72e