chore: merge changes

docker-compose.yml

@@ -26,3 +26,31 @@ services:
     #command: ["npm", "run", "server"]
     command: ["npm", "run", "server"]
 
+
+name: musicblocks
+services:
+  musicblocks:
+    build: 
+      context: https://github.com/sugarlabs/musicblocks.git#test-collab
+    ports: 
+      - "3000:3000"
+    command: ["python", "-m", "http.server", "3000", "--bind", "0.0.0.0"]
+    env_file:
+     - ./environment
+  # planet-server:
+  #    build:
+  #        dockerfile: ../planet-server/Dockerfile
+  #    ports:
+  #      - "8000:8000"
+  collaboration-server:
+    build: https://github.com/sugarlabs/collaboration-server.git#test-collab
+    # build:
+    #     dockerfile: ../collaboration-server/Dockerfile
+    # volumes:
+    #   - .:/collaboration-server
+    ports:
+      - "8080:8080"
+    environment:
+      NODE_ENV: development
+    #command: ["npm", "run", "server"]
+    command: ["npm", "run", "server"]

js/collaboration/collaboration.js

@@ -24,7 +24,6 @@ class Collaboration {
         this.attempts = 0;
         this.socket = null;
         this.blockList = this.activity.blocks.blockList;
-        this.HOST = "http://127.0.0.1";
         this.PORT = "8080";
         this.COLLAB_HOST = "http://127.0.0.1";
         this.hasCollaborationStarted = false;

planet/js/ServerInterface.js

@@ -96,4 +96,4 @@ class ServerInterface {
 
     init() { };
 
-}
+}