Merge remote-tracking branch 'origin/master'

docker-compose.yml

@@ -1,15 +1,15 @@
 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:
   waecm_g4_be:
     container_name: waecm_g4_be_container
     hostname: waecm_g4_be
     image: pfingstfrosch/waecm-2021-group-04-bsp-1-be
-    build:
-      context: ./backend
-      dockerfile: ./Dockerfile
+#    build:
+#      context: ./backend
+#      dockerfile: ./Dockerfile
     command: python manage.py runserver 0.0.0.0:8000
     ports:
     - 8000:8000
@@ -18,8 +18,8 @@ services:
     container_name: waecm_g4_fe_container
     hostname: waecm_g4_fe
     image: pfingstfrosch/waecm-2021-group-04-bsp-1-fe
-    build:
-      context: ./frontend
-      dockerfile: ./Dockerfile
+#    build:
+#      context: ./frontend
+#      dockerfile: ./Dockerfile
     ports:
       - 4200:80