Merge branch 'develop' of github.com:thecodingmachine/workadventure into iframe_api

# Conflicts: # front/dist/.gitignore # front/dist/index.tmpl.html # front/src/Phaser/Game/GameScene.ts # front/src/WebRtc/CoWebsiteManager.ts
2021-03-28 16:53:15 +02:00
parent 07666f6ce2 4b8a2aca34
commit aaaa192b71
46 changed files with 1223 additions and 403 deletions
@@ -53,10 +53,8 @@ services:
  pusher:
    image: thecodingmachine/nodejs:12
    command: yarn dev
-    #command: yarn run prod
-    #command: yarn run profile
    environment:
-      DEBUG: "*"
+      DEBUG: "socket:*"
      STARTUP_COMMAND_1: yarn install
      SECRET_JITSI_KEY: "$SECRET_JITSI_KEY"
      SECRET_KEY: yourSecretKey