Merge branch 'master' of github.com:MetaMask/mustekala

docker/rendezvous/docker-compose.yml

@@ -1,30 +1,3 @@
-nginx-proxy:
-  build: ./nginx-proxy/.
-  container_name: nginx-proxy
-  restart: always
-  ports:
-    # 80 should be open to the internet for letsencrypt purposes
-    - "80:80"
-    # 443 should be open to the internet for wss
-    - "443:443"
-  volumes:
-    - /home/core/ssl-certs:/etc/nginx/certs:ro
-    - /etc/nginx/vhost.d
-    - /usr/share/nginx/html
-    - /var/run/docker.sock:/tmp/docker.sock:ro
-  environment:
-    DEFAULT_HOST: "kitsunet.metamask.io"
-
-letsencrypt-nginx-proxy-companion:
-  image: jrcs/letsencrypt-nginx-proxy-companion
-  container_name: letsencrypt-nginx-proxy-companion
-  restart: always
-  volumes_from:
-    - nginx-proxy
-  volumes:
-    - /home/core/ssl-certs:/etc/nginx/certs:rw
-    - /var/run/docker.sock:/var/run/docker.sock:ro
-
 ipfs-rendezvous-experiment:
   image: dryajov/ipfs-rendezvous-experiment
   restart: always

docker/telemetry/docker-compose.yml

@@ -0,0 +1,23 @@
+nginx-proxy:
+  image: jwilder/nginx-proxy
+  container_name: nginx-proxy
+  restart: always
+  ports:
+    - "80:80"
+    - "443:443"
+  volumes:
+    - ../../../volumes/proxy/certs:/etc/nginx/certs:ro
+    - /etc/nginx/vhost.d
+    - /usr/share/nginx/html
+    - /var/run/docker.sock:/tmp/docker.sock:ro
+
+letsencrypt-nginx-proxy-companion:
+  image: jrcs/letsencrypt-nginx-proxy-companion
+  container_name: letsencrypt-nginx-proxy-companion
+  restart: always
+  volumes_from:
+    - nginx-proxy
+  volumes:
+    - "/var/run/docker.sock:/var/run/docker.sock:ro"
+    - "../../../volumes/proxy/certs:/etc/nginx/certs:rw"
+

docker/webrtc-star/docker-compose.yml

@@ -1,47 +1,15 @@
-nginx-proxy:
-  build: ./nginx-proxy/.
-  container_name: nginx-proxy
-  restart: always
-  ports:
-    # 80 should be open to the internet for letsencrypt purposes
-    - "80:80"
-    # 443 should be open to the internet for wss
-    - "443:443"
-  volumes:
-    - /home/core/ssl-certs:/etc/nginx/certs:ro
-    - /etc/nginx/vhost.d
-    - /usr/share/nginx/html
-    - /var/run/docker.sock:/tmp/docker.sock:ro
-  environment:
-    DEFAULT_HOST: "kitsunet.metamask.io"
-
-letsencrypt-nginx-proxy-companion:
-  image: jrcs/letsencrypt-nginx-proxy-companion
-  container_name: letsencrypt-nginx-proxy-companion
-  restart: always
-  volumes_from:
-    - nginx-proxy
-  volumes:
-    - /home/core/ssl-certs:/etc/nginx/certs:rw
-    - /var/run/docker.sock:/var/run/docker.sock:ro
-
-ipfs-rendezvous-experiment:
-  build: ./signaler/.
+webrtc-star-signaller:
+  build: ./signaller/.
   container_name: webrtc-star
   restart: always
-  expose:
-    # This port is the one that nginx-proxy container will use to redirect calls
-    # Has to be represented in the environment variable VIRTUAL_PORT below
-    - "9090"
   ports:
-    - "9090:9090"
+    - "9090"
   ulimits:
     nofile:
       soft: 20000
       hard: 40000
   environment:
-    VIRTUAL_HOST: "${HOSTNAME}.kitsunet.metamask.io"
     VIRTUAL_PORT: "9090"
-    LETSENCRYPT_HOST: "${HOSTNAME}.kitsunet.metamask.io"
-    LETSENCRYPT_EMAIL: "herman.junge@consensys.net"
-
+    VIRTUAL_HOST: "signaller.lab.metamask.io"
+    LETSENCRYPT_HOST: "signaller.lab.metamask.io"
+    LETSENCRYPT_EMAIL: "admin@metamask.io"

docker/webrtc-star/signaler/Dockerfile → docker/webrtc-star/signaller/Dockerfile

@@ -9,7 +9,7 @@ run npm init -y
 RUN npm install libp2p-webrtc-star
 
 # start server
-CMD npx star-signal --port=9090 --host=127.0.0.1
+CMD npx star-signal --port=9090 --host=0.0.0.0
 
 # expose server
 EXPOSE 9090