diff --git a/bin/server.js b/bin/server.js index 8fb2d65..f2806a6 100644 --- a/bin/server.js +++ b/bin/server.js @@ -122,7 +122,9 @@ class Server { console.log('\nConfiguration:') console.log(`Circuit Relay: ${this.config.isCircuitRelay}`) console.log(`IPFS TCP port: ${this.config.ipfsTcpPort}`) - console.log(`IPFS WS port: ${this.config.ipfsWsPort}\n`) + console.log(`IPFS WS port: ${this.config.ipfsWsPort}`) + console.log(`IPFS WebRTC port: ${this.config.ipfsWebRtcPort}`) + console.log(`Connection preference: ${this.config.connectPref}\n`) return app } catch (err) { diff --git a/config/env/common.js b/config/env/common.js index 85f241c..fe4d6da 100644 --- a/config/env/common.js +++ b/config/env/common.js @@ -132,6 +132,7 @@ export default { ipfsTcpPort: process.env.IPFS_TCP_PORT ? process.env.IPFS_TCP_PORT : 4001, ipfsWsPort: process.env.IPFS_WS_PORT ? process.env.IPFS_WS_PORT : 4003, ipfsWebRtcPort: process.env.IPFS_WEB_RTC_PORT ? process.env.IPFS_WEB_RTC_PORT : 4005, + connectPref: process.env.CONNECT_PREF, // Used in helia-coord to select connection preference. // Settings for production, using external go-ipfs node. isProduction: process.env.SVC_ENV === 'prod' ? true : false, diff --git a/production/docker/Dockerfile b/production/docker/Dockerfile index d3ef060..94ae35e 100644 --- a/production/docker/Dockerfile +++ b/production/docker/Dockerfile @@ -66,9 +66,6 @@ RUN npm install # Generate the API docs RUN npm run docs -# Expose the port the API will be served on. -EXPOSE 5010 - # Start the application. #COPY start-production.sh start-production.sh CMD ["./start-production.sh"] diff --git a/production/docker/docker-compose.yml b/production/docker/docker-compose.yml index 35a758b..93f073b 100644 --- a/production/docker/docker-compose.yml +++ b/production/docker/docker-compose.yml @@ -26,9 +26,12 @@ services: links: - mongo-ipfs-service ports: - - '5010:5010' # : - - '4001:4001' - - '4003:4003' + # : + - '5010:5010' # REST API + - '4001:4001' # TCP + - '4003:4003' # Websockets + - '4005:4005' # WebRTC + volumes: - ../data/ipfsdata:/home/safeuser/ipfs-service-provider/.ipfsdata - ./start-production.sh:/home/safeuser/ipfs-service-provider/start-production.sh diff --git a/production/docker/start-production.sh b/production/docker/start-production.sh index 2073556..30ce5d3 100755 --- a/production/docker/start-production.sh +++ b/production/docker/start-production.sh @@ -31,7 +31,7 @@ export IPFS_HOST=172.17.0.1 export IPFS_API_PORT=5001 export IPFS_TCP_PORT=4001 export IPFS_WS_PORT=4003 - +export IPFS_WEB_RTC_PORT=4005 # Set the debug level for helia-coord. 0-3. # 0 = no debug logs. 3 = maximum debug logs. export DEBUG_LEVEL=0