diff --git a/.env.example b/.env.example index 3ecb4d8..0dacc6a 100644 --- a/.env.example +++ b/.env.example @@ -1,2 +1,6 @@ POSTGRES_PASSWORD=supersecretpassword -BACKEND_PORT=4000 \ No newline at end of file +BACKEND_PORT=4000 +SENDGRID_API_KEY= +JWT_SECRET= +SITE_URL=test.com +DATABASE_URL= diff --git a/backend b/backend index bc06090..e86e0d6 160000 --- a/backend +++ b/backend @@ -1 +1 @@ -Subproject commit bc060904371878e5bacd0141f93ca87cb5b6db44 +Subproject commit e86e0d60278f751342be30ef5ba91811669b44b2 diff --git a/docker-compose.yml b/docker-compose.yml index 8ab6ab0..ad5d12a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,22 +4,22 @@ services: db: image: 'postgres' container_name: questionForm_db + expose: + - 5432 env_file: - .env + networks: + - internal + volumes: - db_data:/var/lib/postgresql/data frontend: container_name: questionForm_frontend - restart: unless-stopped build: frontend/ - ports: - - 3000:3000 env_file: .env volumes: - frontend-build-folder:/frontend/build - depends_on: - - backend backend: container_name: questionForm_backend @@ -30,8 +30,12 @@ services: - $BACKEND_PORT ports: - 4000:4000 + networks: + - internal + - web depends_on: - db + volumes: db_data: frontend-build-folder: diff --git a/frontend b/frontend index 2634f64..65a6ca3 160000 --- a/frontend +++ b/frontend @@ -1 +1 @@ -Subproject commit 2634f64d1f005de40c432be20a0f5a2c7154b5b1 +Subproject commit 65a6ca3e0390ae64ecf84ae837db3fefec181b7e