Syncing with upstream ipfs-service-provider. Fixing merge conflicts

This commit is contained in:
Chris Troutner
2025-02-23 10:44:10 -07:00
5 changed files with 11 additions and 8 deletions
+3 -1
View File
@@ -125,7 +125,9 @@ class Server {
console.log('\nConfiguration:') console.log('\nConfiguration:')
console.log(`Circuit Relay: ${this.config.isCircuitRelay}`) console.log(`Circuit Relay: ${this.config.isCircuitRelay}`)
console.log(`IPFS TCP port: ${this.config.ipfsTcpPort}`) 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 return app
} catch (err) { } catch (err) {
+1
View File
@@ -132,6 +132,7 @@ export default {
ipfsTcpPort: process.env.IPFS_TCP_PORT ? process.env.IPFS_TCP_PORT : 4101, ipfsTcpPort: process.env.IPFS_TCP_PORT ? process.env.IPFS_TCP_PORT : 4101,
ipfsWsPort: process.env.IPFS_WS_PORT ? process.env.IPFS_WS_PORT : 4103, ipfsWsPort: process.env.IPFS_WS_PORT ? process.env.IPFS_WS_PORT : 4103,
ipfsWebRtcPort: process.env.IPFS_WEB_RTC_PORT ? process.env.IPFS_WEB_RTC_PORT : 4105, ipfsWebRtcPort: process.env.IPFS_WEB_RTC_PORT ? process.env.IPFS_WEB_RTC_PORT : 4105,
connectPref: process.env.CONNECT_PREF, // Used in helia-coord to select connection preference.
// Settings for production, using external go-ipfs node. // Settings for production, using external go-ipfs node.
isProduction: process.env.SVC_ENV === 'prod' ? true : false, isProduction: process.env.SVC_ENV === 'prod' ? true : false,
-3
View File
@@ -66,9 +66,6 @@ RUN npm install
# Generate the API docs # Generate the API docs
RUN npm run docs RUN npm run docs
# Expose the port the API will be served on.
#EXPOSE 5010
# Start the application. # Start the application.
#COPY start-production.sh start-production.sh #COPY start-production.sh start-production.sh
CMD ["./start-production.sh"] CMD ["./start-production.sh"]
+6 -4
View File
@@ -26,10 +26,12 @@ services:
links: links:
- mongo-bch-consumer - mongo-bch-consumer
ports: ports:
- '5015:5015' # <host port>:<container port> # <host port>:<container port>
- '4101:4101' - '5015:5015' # REST API
- '4103:4103' - '4101:4101' # TCP
- '4105:4105' - '4103:4103' # Websockets
- '4105:4105' # WebRTC
volumes: volumes:
- ../data/ipfsdata:/home/safeuser/ipfs-bch-wallet-consumer/.ipfsdata - ../data/ipfsdata:/home/safeuser/ipfs-bch-wallet-consumer/.ipfsdata
- ./start-production.sh:/home/safeuser/ipfs-bch-wallet-consumer/start-production.sh - ./start-production.sh:/home/safeuser/ipfs-bch-wallet-consumer/start-production.sh
+1
View File
@@ -31,6 +31,7 @@ export IPFS_HOST=172.17.0.1
export IPFS_API_PORT=5001 export IPFS_API_PORT=5001
export IPFS_TCP_PORT=4101 export IPFS_TCP_PORT=4101
export IPFS_WS_PORT=4103 export IPFS_WS_PORT=4103
export IPFS_WEB_RTC_PORT=4105
# Set the debug level for helia-coord. 0-3. # Set the debug level for helia-coord. 0-3.
# 0 = no debug logs. 3 = maximum debug logs. # 0 = no debug logs. 3 = maximum debug logs.