Merge pull request #6 from ElrondNetwork/update-mainnet-obs-squad

update observing squad
multiversx · Jan 20, 2021 · 1052dad · 1052dad
2 parents e56526e + e6d8fd7
commit 1052dad
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 18 deletions.
diff --git a/README.md b/README.md
@@ -8,8 +8,8 @@ Skip this if you prefer to pull from [docker hub](https://hub.docker.com/u/elron
 
 ```bash
 cd mainnet
-docker image build . -t elrondnetwork/elrond-node-obs:v1.1.10 -f ./elrond-node-obs
-docker image build . -t elrondnetwork/elrond-proxy:v1.1.3 -f ./elrond-proxy
+docker image build . -t elrondnetwork/elrond-node-obs:v1.1.24 -f ./elrond-node-obs
+docker image build . -t elrondnetwork/elrond-proxy:v1.1.4 -f ./elrond-proxy
 ```
 
 ```bash
@@ -20,8 +20,8 @@ docker image build . -t elrondnetwork/elrond-go-keygenerator:latest -f ./elrond-
 ## How to pull the images from Docker Hub
 
 ```bash
-docker pull elrondnetwork/elrond-node-obs:v1.1.10
-docker pull elrondnetwork/elrond-proxy:v1.1.3
+docker pull elrondnetwork/elrond-node-obs:v1.1.24
+docker pull elrondnetwork/elrond-proxy:v1.1.4
 docker pull elrondnetwork/elrond-go-keygenerator:latest
 ```
 
@@ -151,8 +151,8 @@ export IP=10.0.0.2
 
 1. Pull the new images:
 ```
-docker pull elrondnetwork/elrond-node-obs:v1.1.10
-docker pull elrondnetwork/elrond-proxy:v1.1.3
+docker pull elrondnetwork/elrond-node-obs:v1.1.24
+docker pull elrondnetwork/elrond-proxy:v1.1.4
 ```
 2. Get the latest version of this repository.
 ```

diff --git a/mainnet/.env b/mainnet/.env
@@ -16,4 +16,7 @@ OBSERVER_DIR_M=~/MyObservingSquad/node-metachain
 IP_0=10.0.0.6
 IP_1=10.0.0.5
 IP_2=10.0.0.4
-IP_M=10.0.0.3
+IP_M=10.0.0.3
+
+NODE_TAG=elrond-node-obs:v1.1.24
+PROXY_TAG=elrond-proxy:v1.1.4
diff --git a/mainnet/docker-compose.yml b/mainnet/docker-compose.yml
@@ -1,8 +1,8 @@
-version: '3.8'
+version: '3'
 
 services:
  observer-0:
-   image: elrondnetwork/elrond-node-obs:v1.1.10
+   image: elrondnetwork/${NODE_TAG}
    ports:
      - "8080:8080"
      - "10000:37373"
@@ -18,7 +18,7 @@ services:
        ipv4_address: 10.0.0.6
 
  observer-1:
-   image: elrondnetwork/elrond-node-obs:v1.1.10
+   image: elrondnetwork/${NODE_TAG}
    ports:
      - "8081:8080"
      - "10001:37373"
@@ -33,7 +33,7 @@ services:
      elrond-squad:
        ipv4_address: 10.0.0.5
  observer-2:
-   image: elrondnetwork/elrond-node-obs:v1.1.10
+   image: elrondnetwork/${NODE_TAG}
    ports:
     - "8082:8080" 
     - "10002:37373"
@@ -49,7 +49,7 @@ services:
        ipv4_address: 10.0.0.4
 
  observer-meta:
-   image: elrondnetwork/elrond-node-obs:v1.1.10
+   image: elrondnetwork/${NODE_TAG}
    ports:
      - "8083:8080"
      - "10003:37373"
@@ -65,7 +65,7 @@ services:
        ipv4_address: 10.0.0.3
 
  proxy:
-   image: elrondnetwork/elrond-proxy:v1.1.3
+   image: elrondnetwork/${PROXY_TAG}
    ports:
      - "8079:8079"
    environment:

diff --git a/mainnet/elrond-node-obs b/mainnet/elrond-node-obs
@@ -1,7 +1,7 @@
 FROM golang:1.14.9 as builder
 
-RUN git clone https://github.com/ElrondNetwork/elrond-config-mainnet && cd elrond-config-mainnet && git checkout --force tags/v1.1.10.0
-RUN git clone https://github.com/ElrondNetwork/elrond-go.git && cd elrond-go && git checkout --force tags/v1.1.10
+RUN git clone https://github.com/ElrondNetwork/elrond-config-mainnet && cd elrond-config-mainnet && git checkout --force tags/v1.1.24.0
+RUN git clone https://github.com/ElrondNetwork/elrond-go.git && cd elrond-go && git checkout --force tags/v1.1.24
 
 #Build node binary
 WORKDIR /go/elrond-go/

diff --git a/mainnet/elrond-proxy b/mainnet/elrond-proxy
@@ -3,7 +3,7 @@ FROM golang:1.14.9 as builder
 RUN mkdir /root/.ssh && chmod 700 /root/.ssh
 
 # Clone the elrond-proxy-go repo 
-RUN git clone -b master https://github.com/ElrondNetwork/elrond-proxy-go.git && cd elrond-proxy-go && git checkout --force tags/v1.1.3
+RUN git clone -b master https://github.com/ElrondNetwork/elrond-proxy-go.git && cd elrond-proxy-go && git checkout --force tags/v1.1.4
 
 # Proxy
 WORKDIR /go/elrond-proxy-go/cmd/proxy

diff --git a/mainnet/run-observer.sh b/mainnet/run-observer.sh
@@ -1,3 +1,4 @@
 #!/bin/bash
-docker run --mount type=bind,source=${OBSERVER_DIR}/db,destination=/go/elrond-go/cmd/node/db --mount type=bind,source=${OBSERVER_DIR}/logs,destination=/go/elrond-go/cmd/node/logs --mount type=bind,source=${OBSERVER_DIR}/config,destination=/config --publish ${P2P_PORT}:37373 --network=elrond-squad --ip=${IP} --name squad-${SHARD} elrondnetwork/elrond-node-obs:v1.1.10 \
+docker run --mount type=bind,source=${OBSERVER_DIR}/db,destination=/go/elrond-go/cmd/node/db --mount type=bind,source=${OBSERVER_DIR}/logs,destination=/go/elrond-go/cmd/node/logs --mount type=bind,source=${OBSERVER_DIR}/config,destination=/config --publish ${P2P_PORT}:37373 --network=elrond-squad --ip=${IP} --name squad-${SHARD} elrondnetwork/elrond-node-obs:v1.1.24 \
 --destination-shard-as-observer=${SHARD} --validator-key-pem-file=/config/observerKey_${SHARD}.pem --display-name="${DISPLAY_NAME}"
+
diff --git a/mainnet/run-proxy.sh b/mainnet/run-proxy.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-docker run --network=elrond-squad --ip=${IP} --name proxy elrondnetwork/elrond-proxy:v1.1.3
+ docker run --network=elrond-squad --ip=${IP} --name proxy elrondnetwork/elrond-proxy:v1.1.4