diff --git a/production/docker/bch-dex-ui/Dockerfile b/production/docker/bch-dex-ui/Dockerfile index 7a308d3..3f5a523 100644 --- a/production/docker/bch-dex-ui/Dockerfile +++ b/production/docker/bch-dex-ui/Dockerfile @@ -12,7 +12,7 @@ RUN apt-get update RUN apt-get install -y sudo git curl nano gnupg wget #Install Node and NPM -RUN curl -sL https://deb.nodesource.com/setup_16.x -o nodesource_setup.sh +RUN curl -sL https://deb.nodesource.com/setup_20.x -o nodesource_setup.sh RUN bash nodesource_setup.sh RUN apt-get install -y nodejs build-essential @@ -34,7 +34,7 @@ WORKDIR /home/safeuser # Update to the latest version of npm. #RUN npm install -g npm@7.23.0 -RUN npm install -g npm +#RUN npm install -g npm # npm mirror to prevent direct dependency on npm. #RUN npm set registry http://94.130.170.209:4873/ diff --git a/production/docker/bch-dex/Dockerfile b/production/docker/bch-dex/Dockerfile index 282a204..3f34fcf 100644 --- a/production/docker/bch-dex/Dockerfile +++ b/production/docker/bch-dex/Dockerfile @@ -12,7 +12,7 @@ RUN apt-get update RUN apt-get install -y sudo git curl nano gnupg wget #Install Node and NPM -RUN curl -sL https://deb.nodesource.com/setup_16.x -o nodesource_setup.sh +RUN curl -sL https://deb.nodesource.com/setup_20.x -o nodesource_setup.sh RUN bash nodesource_setup.sh RUN apt-get install -y nodejs build-essential @@ -34,7 +34,7 @@ WORKDIR /home/safeuser # Update to the latest version of npm. #RUN npm install -g npm@7.23.0 -RUN npm install -g npm +#RUN npm install -g npm # npm mirror to prevent direct dependency on npm. RUN npm set registry http://94.130.170.209:4873/ diff --git a/production/docker/docker-compose.yml b/production/docker/docker-compose.yml index f6a8607..0fd0fe8 100644 --- a/production/docker/docker-compose.yml +++ b/production/docker/docker-compose.yml @@ -3,9 +3,9 @@ version: '3.9' services: - mongo-p2wdb-service: + mongo-dex: image: mongo:4.2.0 - container_name: mongo-p2wdb-service + container_name: mongo-dex ports: - '5666:27017' # : volumes: @@ -13,69 +13,11 @@ services: command: mongod --logpath=/dev/null # -- quiet restart: always - ipfs: - # https://github.com/christroutner/trickle-ipfs - image: christroutner/trickle-ipfs:v1.0.1 - #build: - # context: ./ - # dockerfile: Dockerfile - container_name: ipfs - environment: - IPFS_DAEMON_ARGUMENTS: '--enable-pubsub-experiment --migrate=true --agent-version-suffix=docker --routing=dhtclient' - UPLOAD_KBPS: '1000' - DOWNLOAD_KBPS: '1000' - logging: - driver: 'json-file' - options: - max-size: '10m' - max-file: '10' - mem_limit: 2000mb - ports: - - 4001:4001 - - 4003:4003 - - 172.17.0.1:5001:5001 - - 172.17.0.1:8080:8080 - command: [ - './start-ipfs.sh' - ] - volumes: - - ../data/go-ipfs/data:/root/.ipfs - restart: always - - p2wdb: - #build: - # context: ./p2wdb/ - # dockerfile: Dockerfile - image: christroutner/p2wdb:v4.1.3 - container_name: p2wdb - environment: - CONSUMER_URL: 'https://free-bch.fullstack.cash' - #ENABLE_BCH_PAYMENT: 1 - DEBUG_LEVEL: 1 - logging: - driver: 'json-file' - options: - max-size: '10m' - max-file: '10' - mem_limit: 1gb - links: - - mongo-p2wdb-service - ports: - # : - - 5667:5667 # REST API - #- 5668:5668 # IPFS TCP port - #- 5669:5669 # IPFS WS Port - volumes: - - ../data/ipfsdata/p2wdb:/home/safeuser/ipfs-p2wdb-service/.ipfsdata/p2wdb - - ./p2wdb/start-production.sh:/home/safeuser/ipfs-p2wdb-service/start-production.sh - #- ../scripts/wallet.json:/home/safeuser/ipfs-p2wdb-service/wallet.json - restart: always - bch-dex: - #build: - # context: ./bch-dex/ - # dockerfile: Dockerfile - image: christroutner/bch-dex:v2.2.4 + build: + context: ./bch-dex/ + dockerfile: Dockerfile + #image: christroutner/bch-dex:v2.2.4 container_name: bch-dex environment: CONSUMER_URL: 'https://free-bch.fullstack.cash' @@ -86,8 +28,8 @@ services: max-file: '10' mem_limit: 1000mb links: - - mongo-p2wdb-service - - p2wdb + - mongo-dex + #- p2wdb ports: - '5700:5700' # : volumes: @@ -96,13 +38,13 @@ services: restart: always dex-ui: - #build: - # context: ./bch-dex-ui/ - # dockerfile: Dockerfile - image: christroutner/bch-dex-ui:v1.2.4 + build: + context: ./bch-dex-ui/ + dockerfile: Dockerfile + #image: christroutner/bch-dex-ui:v1.2.4 container_name: dex-ui environment: - SERVER: 'http://192.168.2.3' + SERVER: 'http://172.17.0.1' logging: driver: 'json-file' options: diff --git a/production/docker/p2wdb/Dockerfile b/production/docker/p2wdb/Dockerfile deleted file mode 100644 index 6bc5965..0000000 --- a/production/docker/p2wdb/Dockerfile +++ /dev/null @@ -1,71 +0,0 @@ -# Create a Docker container for the P2WDB -# - -#IMAGE BUILD COMMANDS -FROM ubuntu:20.04 -MAINTAINER Chris Troutner - -#Update the OS and install any OS packages needed. -RUN apt-get update -RUN apt-get install -y sudo git curl nano gnupg wget - -#Install Node and NPM -RUN curl -sL https://deb.nodesource.com/setup_16.x -o nodesource_setup.sh -RUN bash nodesource_setup.sh -RUN apt-get install -y nodejs build-essential - -#Create the user 'safeuser' and add them to the sudo group. -RUN useradd -ms /bin/bash safeuser -RUN adduser safeuser sudo - -#Set password to 'abcd8765' change value below if you want a different password -RUN echo safeuser:abcd8765 | chpasswd - -#Set the working directory to be the users home directory -WORKDIR /home/safeuser - -#Setup NPM for non-root global install (like on a mac) -RUN mkdir /home/safeuser/.npm-global -RUN chown -R safeuser .npm-global -RUN echo "export PATH=~/.npm-global/bin:$PATH" >> /home/safeuser/.profile -RUN runuser -l safeuser -c "npm config set prefix '~/.npm-global'" - -# Update to the latest version of npm. -#RUN npm install -g npm@7.23.0 -RUN npm install -g npm - -# npm mirror to prevent direct dependency on npm. -RUN npm set registry http://94.130.170.209:4873/ - -# Switch to user account. -#USER safeuser -# Prep 'sudo' commands. -#RUN echo 'abcd8765' | sudo -S pwd - -# Clone the rest.bitcoin.com repository -RUN git clone https://github.com/Permissionless-Software-Foundation/ipfs-p2wdb-service -WORKDIR /home/safeuser/ipfs-p2wdb-service -RUN mkdir .ipfsdata -RUN git checkout ct-unstable - -#RUN npm install fsevents - -# Install dependencies -#RUN mkdir .ipfsdata -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"] - -#CMD ["npm", "start"] - -# Used for debugging -#COPY dummyapp.js dummyapp.js -#CMD ["node", "dummyapp.js"] diff --git a/production/docker/p2wdb/dummyapp.js b/production/docker/p2wdb/dummyapp.js deleted file mode 100644 index 8cd4613..0000000 --- a/production/docker/p2wdb/dummyapp.js +++ /dev/null @@ -1,4 +0,0 @@ -setInterval(function () { - const now = new Date() - console.log(`ping ${now.toLocaleString()}`) -}, 10000) diff --git a/production/docker/p2wdb/start-production.sh b/production/docker/p2wdb/start-production.sh deleted file mode 100755 index 8daafad..0000000 --- a/production/docker/p2wdb/start-production.sh +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/bash - -# BEGIN: Optional configuration settings - -# This mnemonic is used to set up persistent public key for e2ee -# Replace this with your own 12-word mnemonic. -export MNEMONIC="mass response fiscal world message exact series swallow forward confirm canoe festival" - -# The human readable name this IPFS node identifies as. -export COORD_NAME=generic-p2wdb-production - -# Allow this node to function as a circuit relay. It must not be behind a firewall. -#export ENABLE_CIRCUIT_RELAY=true -# For browsers to use your circuit realy, you must set up a domain, SSL certificate, -# and you must forward that subdomain to the IPFS_WS_PORT. -#export CR_DOMAIN=subdomain.yourdomain.com - -# Debug level. 0 = minimal info. 2 = max info. -# This value set by docker-compose.yml -#export DEBUG_LEVEL=1 - -# Log-in information for retrieving a JWT token from FullStack.cash. -export FULLSTACKLOGIN=demo@demo.com -export FULLSTACKPASS=demo - -# END: Optional configuration settings - - -# Production database connection string. -export DBURL=mongodb://172.17.0.1:5666/p2wdb-service-dev - -# Configure IPFS ports -#export IPFS_TCP_PORT=5668 -#export IPFS_WS_PORT=5669 - -# Configure REST API port -export PORT=5667 - -export P2W_ENV=production -export IPFS_HOST=172.17.0.1 -export IPFS_API_PORT=5001 -export IPFS_TCP_PORT=4001 - -# P2WDB specific env vars -#export ORBITDB_NAME=/orbitdb/zdpuAm4fPafpjs5mgbBUJV8Az7kd8Xj1ttD6M1JaAxF8RMRrw/psf-bch-p2wdb-keyvalue-v1.0.0-0004 - -npm start