Skip to content

Commit

Permalink
Merge pull request #207 from uselotus/separate-frontend-backend
Browse files Browse the repository at this point in the history
change repo structure
  • Loading branch information
mnida authored Oct 10, 2022
2 parents 587566e + a9b4c01 commit 50a9fe4
Show file tree
Hide file tree
Showing 191 changed files with 14 additions and 14 deletions.
File renamed without changes.
2 changes: 1 addition & 1 deletion Dockerfile.backend → backend/Dockerfile.backend
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ RUN chmod +x ./scripts/start_backend.dev.sh
# ---------------------------------------
# Production
# ---------------------------------------
FROM build AS production
FROM build AS production
COPY ./scripts/start_backend.prod.sh ./scripts/start_backend.prod.sh
RUN chmod +x ./scripts/start_backend.prod.sh
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion Procfile → backend/Procfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
release: chmod u+x scripts/heroku_release.sh && ./scripts/heroku_release.sh
release: chmod u+x ../scripts/heroku_release.sh && ../scripts/heroku_release.sh
web: gunicorn lotus.wsgi:application -w 4 --threads 4 --preload
worker: celery -A lotus worker -l info
beat: celery -A lotus beat -l info --scheduler django_celery_beat.schedulers:DatabaseScheduler
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
16 changes: 8 additions & 8 deletions docker-compose.dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ services:
env_file:
- ./env/.env.dev
build:
context: .
context: ./backend
dockerfile: Dockerfile.backend
target: development
ports:
- 8000:8000
volumes:
- ./lotus:/lotus/lotus
- ./metering_billing:/lotus/metering_billing
- ./backend/lotus:/lotus/lotus
- ./backend/metering_billing:/lotus/metering_billing
command: sh -c "./scripts/start_backend.dev.sh"
depends_on:
- db
Expand All @@ -29,15 +29,15 @@ services:
frontend:
restart: always
build:
context: .
context: ./frontend
dockerfile: Dockerfile.frontend
target: development
ports:
- 3000:3000
command: yarn run dev --host 0.0.0.0 --port 3000
volumes:
- ./src:/frontend/src:delegated
- ./public:/frontend/public:delegated
- ./frontend/src:/frontend/src:delegated
- ./frontend/public:/frontend/public:delegated
- /frontend/node_modules/
stdin_open: true
depends_on:
Expand All @@ -53,7 +53,7 @@ services:
env_file:
- ./env/.env.dev
build:
context: .
context: ./backend
dockerfile: Dockerfile.backend
target: development
command: celery -A lotus worker -l info
Expand All @@ -67,7 +67,7 @@ services:
- ./env/.env.dev
restart: on-failure
build:
context: .
context: ./backend
dockerfile: Dockerfile.backend
target: development
command: celery -A lotus beat -l info --scheduler django_celery_beat.schedulers:DatabaseScheduler
Expand Down
8 changes: 4 additions & 4 deletions docker-compose.prod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ services:
env_file:
- ./env/.env.prod
build:
context: .
context: ./backend
dockerfile: Dockerfile.backend
target: production
expose:
Expand All @@ -29,7 +29,7 @@ services:
frontend:
restart: always
build:
context: .
context: ./frontend
dockerfile: Dockerfile.frontend
target: production
stdin_open: true
Expand All @@ -50,7 +50,7 @@ services:
env_file:
- ./env/.env.prod
build:
context: .
context: ./backend
dockerfile: Dockerfile.backend
target: production
command: celery -A lotus worker -l info
Expand All @@ -64,7 +64,7 @@ services:
- ./env/.env.prod
restart: on-failure
build:
context: .
context: ./backend
dockerfile: Dockerfile.backend
target: production
command: celery -A lotus beat -l info --scheduler django_celery_beat.schedulers:DatabaseScheduler
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 50a9fe4

Please sign in to comment.