Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
8d97ecec6c
@ -1,15 +1,15 @@
|
|||||||
version: "2"
|
version: "2"
|
||||||
|
|
||||||
# INFO: to not build but just pull - comment out build keys
|
# INFO: to not build but just pull - build keys are commented out
|
||||||
|
|
||||||
services:
|
services:
|
||||||
waecm_g4_be:
|
waecm_g4_be:
|
||||||
container_name: waecm_g4_be_container
|
container_name: waecm_g4_be_container
|
||||||
hostname: waecm_g4_be
|
hostname: waecm_g4_be
|
||||||
image: pfingstfrosch/waecm-2021-group-04-bsp-1-be
|
image: pfingstfrosch/waecm-2021-group-04-bsp-1-be
|
||||||
build:
|
# build:
|
||||||
context: ./backend
|
# context: ./backend
|
||||||
dockerfile: ./Dockerfile
|
# dockerfile: ./Dockerfile
|
||||||
command: python manage.py runserver 0.0.0.0:8000
|
command: python manage.py runserver 0.0.0.0:8000
|
||||||
ports:
|
ports:
|
||||||
- 8000:8000
|
- 8000:8000
|
||||||
@ -18,8 +18,8 @@ services:
|
|||||||
container_name: waecm_g4_fe_container
|
container_name: waecm_g4_fe_container
|
||||||
hostname: waecm_g4_fe
|
hostname: waecm_g4_fe
|
||||||
image: pfingstfrosch/waecm-2021-group-04-bsp-1-fe
|
image: pfingstfrosch/waecm-2021-group-04-bsp-1-fe
|
||||||
build:
|
# build:
|
||||||
context: ./frontend
|
# context: ./frontend
|
||||||
dockerfile: ./Dockerfile
|
# dockerfile: ./Dockerfile
|
||||||
ports:
|
ports:
|
||||||
- 4200:80
|
- 4200:80
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user