From 6f2559ad4fb13744bcfc73bcb036fb9bf60f4d0c Mon Sep 17 00:00:00 2001
From: Apostolof <apotwohd@gmail.com>
Date: Fri, 27 Nov 2020 21:15:24 +0200
Subject: [PATCH] Use newer rendezvous server image, other minor improvements

---
 docker/Makefile                       | 4 +---
 docker/concordia-contracts/Dockerfile | 5 +----
 docker/rendezvous/Dockerfile          | 4 ----
 docker/rendezvous/docker-compose.yml  | 2 +-
 4 files changed, 3 insertions(+), 12 deletions(-)
 delete mode 100644 docker/rendezvous/Dockerfile

diff --git a/docker/Makefile b/docker/Makefile
index de44a80..955cc71 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -45,13 +45,11 @@ run-app-host-chain:
 
 # Ganache targets
 build-ganache:
-	@docker build -f ./ganache/Dockerfile -t concordia-ganache
+	@docker build . -f ./ganache/Dockerfile -t concordia-ganache
 run-ganache:
 	@docker-compose -f ./ganache/docker-compose.yml -p concordia up -d
 
 # Rendezvous targets
-build-rendezvous:
-	@docker build -f ./rendezvous/Dockerfile -t concordia-rendezvous
 run-rendezvous:
 	@docker-compose -f ./rendezvous/docker-compose.yml -p concordia up -d
 
diff --git a/docker/concordia-contracts/Dockerfile b/docker/concordia-contracts/Dockerfile
index a928549..414c2b3 100644
--- a/docker/concordia-contracts/Dockerfile
+++ b/docker/concordia-contracts/Dockerfile
@@ -51,7 +51,7 @@ WORKDIR /usr/src/concordia/packages/concordia-contracts
 ENTRYPOINT ["/opt/concordia-contracts/test-contracts.sh"]
 
 # --------------------------------------------------
-# Stage 4 (Build)
+# Stage 4 (Runtime)
 # --------------------------------------------------
 FROM compile as runtime
 LABEL maintainers.1="Apostolos Fanakis <apostolof@auth.gr>"
@@ -63,7 +63,4 @@ WORKDIR /opt/concordia-contracts
 COPY ./docker/concordia-contracts/migrate.sh .
 RUN ["chmod", "+x", "/opt/concordia-contracts/migrate.sh"]
 
-ARG SKIP_MIGRATE
-ENV SKIP_MIGRATE="${SKIP_MIGRATE}"
-
 ENTRYPOINT ["/opt/concordia-contracts/migrate.sh"]
diff --git a/docker/rendezvous/Dockerfile b/docker/rendezvous/Dockerfile
deleted file mode 100644
index bed3e8a..0000000
--- a/docker/rendezvous/Dockerfile
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM libp2p/websocket-star-rendezvous:release
-
-# Can't use the array form of ENTRYPOINT here because we use env vars
-ENTRYPOINT /usr/local/bin/dumb-init node --max-old-space-size=8192 src/bin.js --port="$RENDEZVOUS_PORT"
diff --git a/docker/rendezvous/docker-compose.yml b/docker/rendezvous/docker-compose.yml
index e4e9b1c..c7f3913 100644
--- a/docker/rendezvous/docker-compose.yml
+++ b/docker/rendezvous/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3.7'
 
 services:
   rendezvous:
-    image: libp2p/websocket-star-rendezvous:release
+    image: libp2p/js-libp2p-webrtc-star:version-0.20.1
     container_name: rendezvous
     restart: always
     ports: