Merge pull request #9 from Permissionless-Software-Foundation/ct-unstable

fix(production): Adjusting production settings

config/env/common.js

@@ -54,5 +54,9 @@ module.exports = {
       name: 'Permissionless Software Foundation',
       url: 'https://PSFoundation.cash'
     }
-  }
+  },
+
+  // IPFS Ports
+  ipfsTcpPort: process.env.IPFS_TCP_PORT ? process.env.IPFS_TCP_PORT : 5668,
+  ipfsWsPort: process.env.IPFS_WS_PORT ? process.env.IPFS_WS_PORT : 5669
 }

config/env/development.js

@@ -7,6 +7,6 @@
 module.exports = {
   session: 'secret-boilerplate-token',
   token: 'secret-jwt-token',
-  database: 'mongodb://localhost:27017/ipfs-service-dev',
+  database: 'mongodb://localhost:27017/bch-service-dev',
   env: 'dev'
 }

config/env/production.js

@@ -10,6 +10,8 @@
 module.exports = {
   session: 'secret-boilerplate-token',
   token: 'secret-jwt-token',
-  database: 'mongodb://172.17.0.1:5555/ipfs-service-prod',
+  database: process.env.DBURL
+    ? process.env.DBURL
+    : 'mongodb://172.17.0.1:5555/bch-service-prod',
   env: 'prod'
 }

config/env/test.js

@@ -7,6 +7,6 @@
 module.exports = {
   session: 'secret-boilerplate-token',
   token: 'secret-jwt-token',
-  database: 'mongodb://localhost:27017/ipfs-service-test',
+  database: 'mongodb://localhost:27017/bch-service-test',
   env: 'test'
 }

docker-compose.yml

@@ -1,25 +0,0 @@
-# Start the testnet server with the command 'docker-compose up -d'
-
-koa-mongodb:
-  image: mongo
-  container_name: mongo-koa
-  ports:
-    - "5555:27017" # <host port>:<container port>
-  volumes:
-    - ./database:/data/db
-  command: mongod --smallfiles --logpath=/dev/null # -- quiet
-  restart: always
-
-koa:
-  build: ./production/
-  dockerfile: Dockerfile
-  container_name: koa
-  links:
-    - koa-mongodb
-  ports:
-    - "5001:5001"  # <host port>:<container port>
-  volumes:
-#    - ./logs:/home/coinjoin/consolidating-coinjoin/logs
-    - ./keys:/home/safeuser/keys
-
-  restart: always

production/Dockerfile

@@ -29,13 +29,13 @@ RUN echo 'abcd8765' | sudo -S pwd
 
 # Clone the rest.bitcoin.com repository
 WORKDIR /home/safeuser
-RUN git clone https://github.com/christroutner/koa-api-boilerplate
-RUN mv koa-api-boilerplate koa
-RUN mkdir keys
+RUN git clone https://github.com/Permissionless-Software-Foundation/ipfs-bch-wallet-service
+# RUN mv koa-api-boilerplate koa
+# RUN mkdir keys
 
 # Switch to the desired branch. `master` is usually stable,
 # and `stage` has the most up-to-date changes.
-WORKDIR /home/safeuser/koa
+WORKDIR /home/safeuser/ipfs-bch-wallet-service
 
 # For development: switch to unstable branch
 # RUN git checkout unstable
@@ -46,13 +46,14 @@ RUN npm install
 # Generate the API docs
 RUN npm run docs
 
-VOLUME /home/safeuser/keys
-
-# Expose the port the API will be served on.
-EXPOSE 5001
+# Calling out the directorys that should be mounted as external volumes.
+RUN mkdir /home/safeuser/ipfsdata
+RUN mkdir /home/safeuser/orbitdb
+VOLUME /home/safeuser/ipfsdata
+VOLUME /home/safeuser/orbitdb
 
 # Start the application.
-COPY start-production start-production
-CMD ["./start-production"]
+COPY start-production.sh start-production.sh
+CMD ["./start-production.sh"]
 
 #CMD ["npm", "start"]

production/cleanup-images.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# Remove all untagged docker images.
+docker rmi $(docker images | grep "^<none>" | awk '{print $3}')
+

production/docker-compose.yml

@@ -0,0 +1,28 @@
+# Start the testnet server with the command 'docker-compose up -d'
+
+bch-wallet-mongodb:
+  image: mongo
+  container_name: mongo-bch-service
+  ports:
+    - '5555:27017' # <host port>:<container port>
+  volumes:
+    - ./database:/data/db
+  command: mongod --logpath=/dev/null # -- quiet
+  restart: always
+
+bch-wallet-service:
+  build: ./
+  dockerfile: Dockerfile
+  container_name: bch-wallet-service
+  links:
+    - bch-wallet-mongodb
+  ports:
+    # <host port>:<container port>
+    - '5001:5001' # REST API
+    - '5668:5668' # IPFS TCP Port
+    - '5669:5669' # IPFS WS Port
+  volumes:
+    - ../ipfsdata:/home/safeuser/ipfsdata
+    - ../orbitdb:/home/safeuser/orbitdb
+
+  restart: always

production/start-production

@@ -1,3 +0,0 @@
-#!/bin/bash
-export KOA_ENV=production
-npm start

production/start-production.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+# Customize these environment variables for your own installation.
+export AUTHSERVER=https://auth.fullstack.cash
+export APISERVER=https://api.fullstack.cash/v5/
+export FULLSTACKLOGIN=demo@demo.com
+export FULLSTACKPASS=demo
+
+# Ports
+export PORT=5001 # REST API
+export IPFS_TCP_PORT=5668 # IPSF TCP Port
+export IPFS_WS_PORT=5669 # IPFS WS Port
+
+# Production database connection string.
+export DBURL=mongodb://172.17.0.1:5555/ipfs-service-prod
+
+#export ENABLE_CIRCUIT_RELAY=1
+
+export SVC_ENV=production
+npm start