buildsystem: simplify Makefile and ci automation (#7189)

Move images into contrib/images/.

Replace "bad tag" cosmos-sdk/simapp with cosmos-sdk/simd-env.
'simapp' is a misnomer as the images serves only as host
environment for the binaries that are in fact built by the
developer on their machine.

Remove the build-docker-local-simapp target altogether
from the Makefile in favor of an inline conditional statement
that causes the image to be rebuilt if and only if it had not
been built before.

simd binary won't run as root anymore as root privileges
are dropped upon simd binary installation.

Co-authored-by: Marko Baricevic <marbar3778@yahoo.com>
Co-authored-by: Alexander Bezobchuk <alexanderbez@users.noreply.github.com>
Co-authored-by: Alessio Treglia <alessio@tendermint.com>
This commit is contained in:
Alexander Bezobchuk
2020-08-31 15:39:05 +02:00
committed by GitHub
co-authored by Marko Baricevic Alessio Treglia
parent db9b69dfe4
commit 91ff9fa417
7 changed files with 76 additions and 29 deletions
+14 -18
View File
@@ -3,68 +3,64 @@ version: "3"
services:
simdnode0:
container_name: simdnode0
image: "cosmos-sdk/simapp"
image: "cosmossdk/simd-env"
ports:
- "26654-26655:26656-26657"
- "1316:1317"
- "9089:9090"
command: ["simd", "start"]
- "26656-26657:26656-26657"
- "1317:1317"
- "9090:9090"
environment:
- ID=0
- LOG=${LOG:-simd.log}
volumes:
- ./build/node0/simd/:/root/.simapp:Z
- ./build:/simd:Z
networks:
localnet:
ipv4_address: 192.168.10.2
simdnode1:
container_name: simdnode1
image: "cosmos-sdk/simapp"
image: "cosmossdk/simd-env"
ports:
- "26659-26660:26656-26657"
- "26666-26667:26656-26657"
- "1318:1317"
- "9091:9090"
command: ["simd", "start"]
environment:
- ID=1
- LOG=${LOG:-simd.log}
volumes:
- ./build/node1/simd/:/root/.simapp:Z
- ./build:/simd:Z
networks:
localnet:
ipv4_address: 192.168.10.3
simdnode2:
container_name: simdnode2
image: "cosmos-sdk/simapp"
image: "cosmossdk/simd-env"
environment:
- ID=2
- LOG=${LOG:-simd.log}
command: ["simd", "start"]
ports:
- "26661-26662:26656-26657"
- "26676-26677:26656-26657"
- "1319:1317"
- "9092:9090"
volumes:
- ./build/node2/simd/:/root/.simapp:Z
- ./build:/simd:Z
networks:
localnet:
ipv4_address: 192.168.10.4
simdnode3:
container_name: simdnode3
image: "cosmos-sdk/simapp"
image: "cosmossdk/simd-env"
environment:
- ID=3
- LOG=${LOG:-simd.log}
command: ["simd", "start"]
ports:
- "26663-26664:26656-26657"
- "26686-26687:26656-26657"
- "1320:1317"
- "9093:9090"
volumes:
- ./build/node3/simd/:/root/.simapp:Z
- ./build:/simd:Z
networks:
localnet:
ipv4_address: 192.168.10.5