Commit 2ef2bfea authored by Liam Svanåsbakken Crouch's avatar Liam Svanåsbakken Crouch 💬
Browse files

Make local development work again

parent 1dbe45c7
Pipeline #113676 passed with stages
in 12 minutes and 21 seconds
...@@ -21,7 +21,7 @@ $ cd secfit/ ...@@ -21,7 +21,7 @@ $ cd secfit/
### Run: ### Run:
$ docker-compose up --build \ $ docker-compose up --build \
Hosts the application on http://localhost:9090 with default settings Hosts the application on http://localhost:3000 with default settings
## Technology ## Technology
......
...@@ -2,7 +2,6 @@ version: '3' ...@@ -2,7 +2,6 @@ version: '3'
services: services:
backend: backend:
container_name: django_group_${GROUPID}
build: build:
context: backend/secfit/ context: backend/secfit/
dockerfile: Dockerfile dockerfile: Dockerfile
...@@ -10,43 +9,20 @@ services: ...@@ -10,43 +9,20 @@ services:
DJANGO_SUPERUSER_USERNAME: "${DJANGO_SUPERUSER_USERNAME}" DJANGO_SUPERUSER_USERNAME: "${DJANGO_SUPERUSER_USERNAME}"
DJANGO_SUPERUSER_PASSWORD: "${DJANGO_SUPERUSER_PASSWORD}" DJANGO_SUPERUSER_PASSWORD: "${DJANGO_SUPERUSER_PASSWORD}"
DJANGO_SUPERUSER_EMAIL: "${DJANGO_SUPERUSER_EMAIL}" DJANGO_SUPERUSER_EMAIL: "${DJANGO_SUPERUSER_EMAIL}"
environment:
- GROUPID=${GROUPID}
networks:
backend_bridge:
ipv4_address: 10.${GROUPID}.0.4
application: application:
container_name: node_group_${GROUPID}
build: build:
context: frontend/ context: frontend/
dockerfile: Dockerfile dockerfile: Dockerfile
args: args:
GROUPID: ${GROUPID} DOMAIN: localhost
DOMAIN: ${DOMAIN} URL_PREFIX: "http://"
URL_PREFIX: ${URL_PREFIX} volumes:
PORT_PREFIX: ${PORT_PREFIX} - ./frontend/www:/app/www
networks:
backend_bridge:
ipv4_address: 10.${GROUPID}.0.5
web: web:
container_name: nginx_group_${GROUPID}
build: build:
context: . context: .
dockerfile: Dockerfile dockerfile: Dockerfile
ports: ports:
- ${PORT_PREFIX}${GROUPID}:80 - 3000:80
environment:
- GROUPID=${GROUPID}
- PORT_PREFIX=${PORT_PREFIX}
networks:
backend_bridge:
ipv4_address: 10.${GROUPID}.0.6
networks:
backend_bridge:
driver: bridge
ipam:
config:
- subnet: 10.${GROUPID}.0.0/18
const HOST = "http://localhost:9090"; const HOST = "http://localhost:3000";
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment