update docker compose file and deployment - reorganize monitoring/logging stack and readmes

makevoid · makevoid · commit f642c9ccba9b · 2019-08-09T12:02:03.000+01:00
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -65,6 +65,25 @@ services:
   #   depends_on:
   #     - api
   #     - parity1
+
+  explorer:
+    hostname: launchpad-explorer
+    image: appliedblockchain/launchpad-explorer:latest
+    build:
+      context: ./explorer
+    environment:
+      ETHEREUM_JSONRPC_ENDPOINT: http://parity1:8545/
+    networks:
+      - main
+    ports:
+      - 3000:3000
+    depends_on:
+      - parity1
+    deploy:
+      mode: global
+      restart_policy:
+        condition: on-failure
+
   parity1:
     hostname: launchpad-parity1
     build:
@@ -78,10 +97,8 @@ services:
         - S3_BUCKET_NAME
     environment:
       - PARITY_ID=1
-    depends_on:
-      - discovery
     networks:
-      - main
+    - main
     ports:
       - 8180:8180
       - 8545:8545
@@ -90,6 +107,13 @@ services:
     image: appliedblockchain/launchpad-parity1:latest
     volumes:
       - parity1_data:/parity/data
+    deploy:
+      restart_policy:
+        condition: on-failure
+      placement:
+        constraints:
+          - node.labels.node_id == 1
+
   parity2:
     hostname: launchpad-parity2
     build:
@@ -100,13 +124,18 @@ services:
         - NPM_TOKEN
     environment:
       - PARITY_ID=2
-    depends_on:
-      - discovery
     networks:
       - main
     image: appliedblockchain/launchpad-parity2:latest
     volumes:
       - parity2_data:/parity/data
+    deploy:
+      restart_policy:
+        condition: on-failure
+      placement:
+        constraints:
+          - node.labels.node_id == 2
+
   parity3:
     hostname: launchpad-parity3
     build:
@@ -117,43 +146,42 @@ services:
         - NPM_TOKEN
     environment:
       - PARITY_ID=3
-    depends_on:
-      - discovery
     networks:
        - main
     image: appliedblockchain/launchpad-parity3:latest
     volumes:
       - parity3_data:/parity/data
+    deploy:
+      restart_policy:
+        condition: on-failure
+      placement:
+        constraints:
+          - node.labels.node_id == 2
+
   discovery:
     hostname: discovery
     image: redis
     ports:
       - 6379:6379
     networks:
-      - main
+    - main
     volumes:
       - discovery:/data
-    deploy:
-      update_config:
-        parallelism: 1
-        delay: 1s
-      restart_policy:
-        condition: on-failure
 
-  logspout:
-    image: gliderlabs/logspout
-    deploy:
-      mode: global
-    environment:
-      - SYSLOG_HOST=logs7.papertrailapp.com:32046
-    # NOTE: change the papertrail url/port before deploying your project
-    command: syslog+tls://$$SYSLOG_HOST
-    networks:
-      - main
-    volumes:
-      - type: bind
-        target: /var/run/docker.sock
-        source: /var/run/docker.sock
+  # logspout:
+  #   image: gliderlabs/logspout
+  #   deploy:
+  #     mode: global
+  #   environment:
+  #     - SYSLOG_HOST=logs.papertrailapp.com:12345
+  #     # NOTE: you have to change the papertrail url with the correct one
+  #   command: syslog+tls://$$SYSLOG_HOST
+  #   networks:
+  #     - main
+  #   volumes:
+  #     - type: bind
+  #       target: /var/run/docker.sock
+  #       source: /var/run/docker.sock
 
 volumes:
   discovery:
diff --git a/explorer/Dockerfile b/explorer/Dockerfile
@@ -2,6 +2,7 @@ FROM appliedblockchain/b-explorer
 
 RUN mkdir /home/explorer/app/bin
 RUN cd bin && npm i node-fetch
-COPY bin/getConfig.js /home/explorer/app/bin/getConfig.js
 
-CMD node bin/getConfig.js && node server.js
+COPY config.js /home/explorer/app
+
+CMD node server.js
diff --git a/explorer/Dockerfile-old b/explorer/Dockerfile-old
@@ -0,0 +1,7 @@
+FROM appliedblockchain/b-explorer
+
+RUN mkdir /home/explorer/app/bin
+RUN cd bin && npm i node-fetch
+COPY bin/getConfig.js /home/explorer/app/bin/getConfig.js
+
+CMD node bin/getConfig.js && node server.js
diff --git a/explorer/config.js b/explorer/config.js
@@ -0,0 +1,6 @@
+{
+  "contracts": {
+  },
+  "addressBook": {
+  }
+}
diff --git a/stack/Dockerfile-parity b/stack/Dockerfile-parity
@@ -1,43 +1,24 @@
-FROM parity/parity:v2.5.0
+FROM parity/parity:v2.5.5-stable
 USER root
-ARG NPM_TOKEN
-RUN echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" > ~/.npmrc
 
 RUN mkdir -p /parity
 
 WORKDIR /parity
 
+RUN apt-get update -y
+RUN apt-get install -y curl bash redis-tools software-properties-common
+
 COPY ./parity/chain/spec.json      spec.json
 COPY ./parity/chain/reserved_peers reserved_peers
 
-ARG PARITY_ID
-ARG S3_ACCESS_KEY_ID
-ARG S3_SECRET_ACCESS_KEY
-ARG S3_BUCKET_NAME
+COPY ./entrypoint-parity.sh .
 
+ARG PARITY_ID
 RUN echo "Building parity${PARITY_ID}..."
 
 COPY ./parity/${PARITY_ID}/password       password
 COPY ./parity/${PARITY_ID}/authority.toml authority.toml
 COPY ./parity/${PARITY_ID}/parity         ./data/keys/parity
 COPY ./parity/${PARITY_ID}/network.key    ./data/network/key
 
-RUN mkdir ~/.aws
-RUN echo "[default]\naws_access_key_id = $S3_ACCESS_KEY_ID\naws_secret_access_key = $S3_SECRET_ACCESS_KEY" > ~/.aws/credentials
-
-RUN apt-get update -y
-RUN apt-get install -y curl bash redis-tools software-properties-common
-
-# convoluted node 10 install
-RUN add-apt-repository -y -r ppa:chris-lea/node.js && rm -f /etc/apt/sources.list.d/chris-lea-node_js-*.list && rm -f /etc/apt/sources.list.d/chris-lea-node_js-*.list.save && \
-  export VERSION=node_10.x && export DISTRO="$(lsb_release -s -c)" && \
-  echo "deb http://deb.nodesource.com/$VERSION $DISTRO main" | tee /etc/apt/sources.list.d/nodesource.list \
-  echo "deb-src http://deb.nodesource.com/$VERSION $DISTRO main" | tee -a /etc/apt/sources.list.d/nodesource.list && \
-  apt-get update && apt-get install -y --allow-unauthenticated nodejs
-
-COPY ./package* /parity/
-# COPY ./backup /parity/
-COPY ./parity/entrypoint-parity.sh /parity/entrypoint.sh
-RUN npm install
-
-ENTRYPOINT [ "bash", "./entrypoint.sh" ]
+ENTRYPOINT [ "bash", "./entrypoint-parity.sh" ]
diff --git a/stack/auth/.htpasswd b/stack/auth/.htpasswd
@@ -0,0 +1 @@
+parity:$apr1$Pb5eOIUl$VRhiOJZPiMVk/.iZ2C9BX.
diff --git a/stack/auth/Dockerfile b/stack/auth/Dockerfile
@@ -0,0 +1,6 @@
+FROM nginx:alpine
+
+WORKDIR /etc/nginx/
+
+COPY nginx.conf .
+COPY .htpasswd  .
diff --git a/stack/auth/nginx.conf b/stack/auth/nginx.conf
@@ -0,0 +1,77 @@
+user  nginx;
+worker_processes  auto;
+#daemon off;
+
+error_log  /var/log/nginx/error.log warn;
+pid        /var/run/nginx.pid;
+
+events {
+  worker_connections 8000;
+
+  multi_accept on;
+  use epoll;
+}
+
+http {
+  include       /etc/nginx/mime.types;
+  default_type  application/octet-stream;
+
+  log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+                    '$status $body_bytes_sent "$http_referer" '
+                    '"$http_user_agent" "$http_x_forwarded_for"';
+
+  sendfile        on;
+  tcp_nopush      on;
+  tcp_nodelay     off;
+
+  keepalive_timeout  65;
+
+  gzip  on;
+  gzip_comp_level    5;
+  gzip_min_length    256;
+  gzip_types
+    application/atom+xml
+    application/javascript
+    application/json
+    application/rss+xml
+    application/vnd.ms-fontobject
+    application/x-font-ttf
+    application/x-web-app-manifest+json
+    application/xhtml+xml
+    application/xml
+    font/opentype
+    image/svg+xml
+    image/x-icon
+    text/css
+    text/plain
+    text/x-component;
+
+  client_max_body_size 120M;
+
+  server {
+    listen 80;
+    server_name _;
+
+    client_header_buffer_size 64k;
+    large_client_header_buffers 4 64k;
+
+    location /health {
+      default_type application/json;
+      return 200 '{ "status": "ok" }';
+    }
+
+    location / {
+      auth_basic 'Restricted';
+      auth_basic_user_file /etc/nginx/.htpasswd;
+
+      proxy_pass http://eth;
+      proxy_set_header X-Real-IP $remote_addr;
+      proxy_buffering off;
+    }
+  }
+
+  upstream eth {
+    server parity1:8545;
+  }
+
+}
diff --git a/stack/entrypoint-parity.sh b/stack/entrypoint-parity.sh
@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+function disco() {
+  redis-cli -h discovery --raw $*
+}
+
+[ "$(disco ping)" == "PONG" ] || { echo "discovery redis not up, exiting..." && exit; }
+
+set -ex
+
+sleep 3
+
+rm -f reserved_peers
+
+for i in 1 2 3; do
+  ENODE=$(disco get "enodes:parity$i")
+  echo "$ENODE" >> reserved_peers
+done
+
+
+parity --chain /parity/spec.json --config /parity/authority.toml -d /parity/data
diff --git a/stack/exceptions/add-sentry.yml b/stack/exceptions/add-sentry.yml
diff --git a/stack/logging/Readme.md b/stack/logging/Readme.md
diff --git a/stack/logging/add-elasticsearch.yml b/stack/logging/add-elasticsearch.yml
diff --git a/stack/monitor/add-prometheus.yml b/stack/monitor/add-prometheus.yml
diff --git a/stack/setup/Dockerfile b/stack/setup/Dockerfile
@@ -0,0 +1,8 @@
+FROM alpine
+
+RUN apk add --update --no-cache curl redis && \
+  rm -rf /tmp/* /var/cache/apk/*
+
+COPY entrypoint.sh .
+
+CMD [ "./entrypoint.sh" ]
diff --git a/stack/setup/entrypoint.sh b/stack/setup/entrypoint.sh
@@ -0,0 +1,37 @@
+#!/usr/bin/env sh
+
+function disco() {
+  redis-cli -h discovery --raw $*
+}
+
+disco flushdb
+
+TIME=2
+
+while [ "$(disco ping)" != "PONG" ]
+do
+  echo "discovery redis not up, waiting..." && sleep 1;
+done
+
+set -ex
+
+PARITY_INSTANCES="parity1 parity2 parity3"
+
+sleep 5
+
+for PARITY in $PARITY_INSTANCES; do
+  ENODE_REQ=$(curl --data '{"method":"parity_enode","params":[],"id":1,"jsonrpc":"2.0"}' -H "Content-Type: application/json" -X POST "$PARITY:8545")
+  ENODE=$(echo "$ENODE_REQ" | grep -o "enode.*30303" | sed -e "s/\@.*/\@$PARITY:30303\"/" | sed -e "s/\"//g")
+  disco set "enodes:$PARITY" "$ENODE"
+done
+
+sleep $TIME
+
+for i in 1 2 3; do
+  for j in 1 2 3; do
+    ENODE=$(disco get "enodes:parity$j")
+    curl --data '{"method":"parity_addReservedPeer","params":["'"$ENODE"'"],"id":1,"jsonrpc":"2.0"}' -H "Content-Type: application/json" -X POST parity"$i":8545
+  done
+done
+
+echo "Setup completed!"
diff --git a/stack/tasks/docker-login.sh b/stack/tasks/docker-login.sh
@@ -0,0 +1,7 @@
+set -xe
+
+IP_A=34.240.100.168
+IP_B=34.254.239.237
+
+ssh root@$IP_A docker login -u abbuilder -p $1
+ssh root@$IP_B docker login -u abbuilder -p $1

-Original file line number
+Diff line change
@@ @@ -0,0 +1,6 @@ @@
 +{
 +  "contracts": {
 +  },
 +  "addressBook": {
 +  }
 +}
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+parity:$apr1$Pb5eOIUl$VRhiOJZPiMVk/.iZ2C9BX.`