[mirotalksfu] - fix conflicts and fast forward

README.md

@@ -160,8 +160,8 @@ $ PORT=3011 npm start
 $ cp app/src/config.template.js app/src/config.js
 # Copy docker-compose.template.yml in docker-compose.yml and edit it if needed
 $ cp docker-compose.template.yml docker-compose.yml
-# Get official image from Docker Hub
+# (Optional) Get official image from Docker Hub
-$ docker pull mirotalk/sfu:latest
+$ docker-compose pull
 # Create and start containers
 $ docker-compose up # -d
 # To stop and remove resources

docker-compose.template.yml

@@ -6,14 +6,6 @@ services:
         build:
             context: .
             dockerfile: Dockerfile
-        container_name: mirotalksfu-npm
-        volumes:
-            - .:/src/
-        command: -v
-        entrypoint: ['npm']
-
-    mirotalksfu:
-        <<: *npm
         container_name: mirotalksfu
         hostname: mirotalksfu
         restart: unless-stopped
@@ -24,4 +16,3 @@ services:
             - '3010:3010/tcp'
             - '40000-40100:40000-40100/tcp'
             - '40000-40100:40000-40100/udp'
-        command: start