Browse Source

Use newer rendezvous server image, other minor improvements

develop
Apostolos Fanakis 4 years ago
parent
commit
6f2559ad4f
  1. 4
      docker/Makefile
  2. 5
      docker/concordia-contracts/Dockerfile
  3. 4
      docker/rendezvous/Dockerfile
  4. 2
      docker/rendezvous/docker-compose.yml

4
docker/Makefile

@ -45,13 +45,11 @@ run-app-host-chain:
# Ganache targets # Ganache targets
build-ganache: build-ganache:
@docker build -f ./ganache/Dockerfile -t concordia-ganache @docker build . -f ./ganache/Dockerfile -t concordia-ganache
run-ganache: run-ganache:
@docker-compose -f ./ganache/docker-compose.yml -p concordia up -d @docker-compose -f ./ganache/docker-compose.yml -p concordia up -d
# Rendezvous targets # Rendezvous targets
build-rendezvous:
@docker build -f ./rendezvous/Dockerfile -t concordia-rendezvous
run-rendezvous: run-rendezvous:
@docker-compose -f ./rendezvous/docker-compose.yml -p concordia up -d @docker-compose -f ./rendezvous/docker-compose.yml -p concordia up -d

5
docker/concordia-contracts/Dockerfile

@ -51,7 +51,7 @@ WORKDIR /usr/src/concordia/packages/concordia-contracts
ENTRYPOINT ["/opt/concordia-contracts/test-contracts.sh"] ENTRYPOINT ["/opt/concordia-contracts/test-contracts.sh"]
# -------------------------------------------------- # --------------------------------------------------
# Stage 4 (Build) # Stage 4 (Runtime)
# -------------------------------------------------- # --------------------------------------------------
FROM compile as runtime FROM compile as runtime
LABEL maintainers.1="Apostolos Fanakis <apostolof@auth.gr>" LABEL maintainers.1="Apostolos Fanakis <apostolof@auth.gr>"
@ -63,7 +63,4 @@ WORKDIR /opt/concordia-contracts
COPY ./docker/concordia-contracts/migrate.sh . COPY ./docker/concordia-contracts/migrate.sh .
RUN ["chmod", "+x", "/opt/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"] ENTRYPOINT ["/opt/concordia-contracts/migrate.sh"]

4
docker/rendezvous/Dockerfile

@ -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"

2
docker/rendezvous/docker-compose.yml

@ -2,7 +2,7 @@ version: '3.7'
services: services:
rendezvous: rendezvous:
image: libp2p/websocket-star-rendezvous:release image: libp2p/js-libp2p-webrtc-star:version-0.20.1
container_name: rendezvous container_name: rendezvous
restart: always restart: always
ports: ports:

Loading…
Cancel
Save