From 3ae5e0c38a7556458fe85a4ee4cbd6c73ae9a088 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Mon, 15 Nov 2021 23:45:29 +0100 Subject: [PATCH] build: fix build environment for the liveness test (backport #10551) (#10552) * build: fix build environment for the liveness test (#10551) Extracted from #10210. Make the test more reproducible, so that it does not require coordination between the build container and the run container. - Use layers to more advantage. - Include bash in the run container. - Put writable output onto a volume. (cherry picked from commit 70a3a90f68a2f8a303ca1662677cd40df08862f1) # Conflicts: # Makefile * fix conflict Co-authored-by: M. J. Fromberger Co-authored-by: Robert Zaremba --- .github/workflows/test.yml | 2 +- Makefile | 9 ++------- contrib/images/Makefile | 3 ++- contrib/images/simd-env/Dockerfile | 25 ++++++++++++++----------- contrib/images/simd-env/wrapper.sh | 11 +++-------- docker-compose.yml | 8 ++++---- 6 files changed, 26 insertions(+), 32 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 62810ca82e0d..782458272335 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -219,7 +219,7 @@ jobs: liveness-test: runs-on: ubuntu-latest - timeout-minutes: 10 + timeout-minutes: 15 steps: - uses: actions/checkout@v2 - uses: actions/setup-go@v2.1.3 diff --git a/Makefile b/Makefile index d3a653d50250..598a4acb1678 100644 --- a/Makefile +++ b/Makefile @@ -483,13 +483,8 @@ proto-update-deps: # Run a 4-node testnet locally localnet-start: build-linux localnet-stop $(if $(shell $(DOCKER) inspect -f '{{ .Id }}' cosmossdk/simd-env 2>/dev/null),$(info found image cosmossdk/simd-env),$(MAKE) -C contrib/images simd-env) - if ! [ -f build/node0/simd/config/genesis.json ]; then $(DOCKER) run --rm \ - --user $(shell id -u):$(shell id -g) \ - -v $(BUILDDIR):/simd:Z \ - -v /etc/group:/etc/group:ro \ - -v /etc/passwd:/etc/passwd:ro \ - -v /etc/shadow:/etc/shadow:ro \ - cosmossdk/simd-env testnet --v 4 -o . --starting-ip-address 192.168.10.2 --keyring-backend=test ; fi + $(DOCKER) run --rm -v $(CURDIR)/localnet:/data cosmossdk/simd-env \ + testnet init-files --v 4 -o /data --starting-ip-address 192.168.10.2 --keyring-backend=test docker-compose up -d localnet-stop: diff --git a/contrib/images/Makefile b/contrib/images/Makefile index c0ec5240fdb8..03d3f8be42e5 100644 --- a/contrib/images/Makefile +++ b/contrib/images/Makefile @@ -1,6 +1,7 @@ all: simd-env simd-env: - docker build --build-arg UID=$(shell id -u) --build-arg GID=$(shell id -g) --tag cosmossdk/simd-env simd-env + docker build --tag cosmossdk/simd-env -f simd-env/Dockerfile \ + $(shell git rev-parse --show-toplevel) .PHONY: all simd-env diff --git a/contrib/images/simd-env/Dockerfile b/contrib/images/simd-env/Dockerfile index 591592b7183e..b4443cdc8a8e 100644 --- a/contrib/images/simd-env/Dockerfile +++ b/contrib/images/simd-env/Dockerfile @@ -1,18 +1,21 @@ -FROM ubuntu:18.04 +FROM golang:1.17-alpine AS build +RUN apk add build-base git linux-headers +WORKDIR /work +COPY go.mod go.sum /work/ +COPY db/go.mod db/go.sum /work/db/ +RUN go mod download +COPY ./ /work +RUN LEDGER_ENABLED=false make clean build -RUN apt-get update && \ - apt-get -y upgrade && \ - apt-get -y install curl jq file +FROM alpine:3.14 AS run +RUN apk add bash curl jq +COPY contrib/images/simd-env/wrapper.sh /usr/bin/wrapper.sh -ARG UID=1000 -ARG GID=1000 - -USER ${UID}:${GID} -VOLUME [ "/simd" ] +VOLUME /simd +COPY --from=build /work/build/simd /simd/ WORKDIR /simd + EXPOSE 26656 26657 ENTRYPOINT ["/usr/bin/wrapper.sh"] CMD ["start", "--log_format", "plain"] STOPSIGNAL SIGTERM - -COPY wrapper.sh /usr/bin/wrapper.sh diff --git a/contrib/images/simd-env/wrapper.sh b/contrib/images/simd-env/wrapper.sh index a2250098577c..d95bf58890ed 100755 --- a/contrib/images/simd-env/wrapper.sh +++ b/contrib/images/simd-env/wrapper.sh @@ -1,4 +1,6 @@ #!/usr/bin/env sh +set -euo pipefail +set -x BINARY=/simd/${BINARY:-simd} ID=${ID:-0} @@ -9,14 +11,7 @@ if ! [ -f "${BINARY}" ]; then exit 1 fi -BINARY_CHECK="$(file "$BINARY" | grep 'ELF 64-bit LSB executable, x86-64')" - -if [ -z "${BINARY_CHECK}" ]; then - echo "Binary needs to be OS linux, ARCH amd64" - exit 1 -fi - -export SIMDHOME="/simd/node${ID}/simd" +export SIMDHOME="/data/node${ID}/simd" if [ -d "$(dirname "${SIMDHOME}"/"${LOG}")" ]; then "${BINARY}" --home "${SIMDHOME}" "$@" | tee "${SIMDHOME}/${LOG}" diff --git a/docker-compose.yml b/docker-compose.yml index d335b9a06c47..a5ef517e547a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,7 +12,7 @@ services: - ID=0 - LOG=${LOG:-simd.log} volumes: - - ./build:/simd:Z + - ./localnet:/data:Z networks: localnet: ipv4_address: 192.168.10.2 @@ -28,7 +28,7 @@ services: - ID=1 - LOG=${LOG:-simd.log} volumes: - - ./build:/simd:Z + - ./localnet:/data:Z networks: localnet: ipv4_address: 192.168.10.3 @@ -44,7 +44,7 @@ services: - "1319:1317" - "9092:9090" volumes: - - ./build:/simd:Z + - ./localnet:/data:Z networks: localnet: ipv4_address: 192.168.10.4 @@ -60,7 +60,7 @@ services: - "1320:1317" - "9093:9090" volumes: - - ./build:/simd:Z + - ./localnet:/data:Z networks: localnet: ipv4_address: 192.168.10.5