Dockernet Linux Support (#327)

Co-authored-by: Jacob Gadikian <jacobgadikian@gmail.com>
Co-authored-by: nghuyenthevinh2000 <nghuyenthevinh@gmail.com>

.github/workflows/superlinter.yml

@@ -0,0 +1,51 @@
+---
+#################################
+#################################
+## Super Linter GitHub Actions ##
+#################################
+#################################
+name: Lint Code Base
+
+#############################
+# Start the job on all push #
+#############################
+on:
+  push:
+    branches-ignore: [master, main]
+    # Remove the line above to run when pushing to master
+  pull_request:
+    branches: [master, main]
+
+###############
+# Set the Job #
+###############
+jobs:
+  build:
+    # Name the Job
+    name: Lint Code Base
+    # Set the agent to run on
+    runs-on: ubuntu-latest
+
+    ##################
+    # Load all steps #
+    ##################
+    steps:
+      ##########################
+      # Checkout the code base #
+      ##########################
+      - name: Checkout Code
+        uses: actions/checkout@v3
+        with:
+          # Full git history is needed to get a proper
+          # list of changed files within `super-linter`
+          fetch-depth: 0
+
+      ################################
+      # Run Linter against code base #
+      ################################
+      - name: Lint Code Base
+        uses: github/super-linter@v4
+        env:
+          VALIDATE_ALL_CODEBASE: false
+          DEFAULT_BRANCH: master
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitmodules

@@ -1,16 +1,16 @@
 [submodule "deps/hermes"]
 	# Commit: fd92eb6d17342bc83003f2067d6a9cd8261f2884
 	path = deps/hermes
-	url = git@github.com:informalsystems/ibc-rs.git
+	url = https://github.com/informalsystems/ibc-rs.git
 [submodule "deps/relayer"]
-	# Commit: da271a9846619bebe4d8723a13c33f613da7562d
+	# Commit: d1dd961969867414c499e89091137710a582cb03
 	# Branch: andrew/client_icq
 	path = deps/relayer
-	url = git@github.com:cosmos/relayer.git
+	url = https://github.com/cosmos/relayer.git
 [submodule "deps/gaia"]
 	# Commit: 5b47714dd5607993a1a91f2b06a6d92cbb504721
 	path = deps/gaia
-	url = git@github.com:Stride-Labs/gaia.git
+	url = https://github.com/Stride-Labs/gaia.git
 [submodule "deps/juno"]
 	# Commit: 955892041359443fbb5addd34c0ab8b66bd8d75c
 	path = deps/juno
@@ -22,4 +22,4 @@
 [submodule "deps/stargaze"]
 	# Commit: b0bea28fc695a2a5c567e56a37b289a5b75830cc
 	path = deps/stargaze
-	url = git@github.com:public-awesome/stargaze.git
+	url = https://github.com/public-awesome/stargaze.git

Dockerfile.gaia

@@ -13,9 +13,11 @@ RUN git clone https://github.com/Stride-Labs/gaia gaia-install \
 
 FROM alpine:3.15
 COPY --from=builder /go/bin/gaiad /usr/local/bin/
-RUN adduser -S -h /home/gaia -D gaia -u 1000
+RUN apk add bash vim \
+    && addgroup -g 1000 gaia \
+    && adduser -S -h /home/gaia -D gaia -u 1000 -G gaia
 
-USER gaia
+USER 1000
 WORKDIR /home/gaia
 
 EXPOSE 26657 26656 1317 9090

Dockerfile.hermes

@@ -16,7 +16,7 @@ COPY --from=builder /opt/ibc-rs/target/release/hermes /usr/local/bin/hermes
 RUN apt-get update \
     && adduser --system --home /home/hermes --disabled-password --disabled-login hermes -u 1000
 
-USER hermes
+USER 1000
 WORKDIR /home/hermes
 
 CMD ["hermes", "start"]

Dockerfile.juno

@@ -20,9 +20,11 @@ RUN LEDGER_ENABLED=false BUILD_TAGS=muslc LINK_STATICALLY=true make build
 
 FROM alpine:3.15
 COPY --from=builder /opt/juno/bin/junod /usr/local/bin/
-RUN adduser -S -h /home/juno -D juno -u 1000
+RUN apk add bash vim \
+    && addgroup -g 1000 juno \
+    && adduser -S -h /home/juno -D juno -u 1000 -G juno
 
-USER juno
+USER 1000
 WORKDIR /home/juno
 
 EXPOSE 26657 26656 1317 9090

Dockerfile.osmo

@@ -23,9 +23,11 @@ RUN BUILD_TAGS=muslc LINK_STATICALLY=true make build
 
 FROM alpine:3.15
 COPY --from=builder /opt/osmosis/build/osmosisd /usr/local/bin/
-RUN adduser -S -h /home/osmosis -D osmosis -u 1000
+RUN apk add bash vim \
+    && addgroup -g 1000 osmosis \
+    && adduser -S -h /home/osmosis -D osmosis -u 1000 -G osmosis
 
-USER osmosis
+USER 1000
 WORKDIR /home/osmosis
 
 EXPOSE 26657 26656 1317 9090

Dockerfile.relayer

@@ -3,7 +3,7 @@ FROM golang:1.18-alpine3.15 AS builder
 
 WORKDIR /src/
 
-ENV COMMIT_HASH=da271a9846619bebe4d8723a13c33f613da7562d
+ENV COMMIT_HASH=d1dd961969867414c499e89091137710a582cb03
 
 RUN apk add --update git make gcc linux-headers libc-dev eudev-dev 
 RUN git clone https://github.com/cosmos/relayer.git \
@@ -14,23 +14,12 @@ RUN git clone https://github.com/cosmos/relayer.git \
 FROM alpine:3.15
 COPY --from=builder /go/bin/rly /usr/local/bin/
 RUN apk add bash vim \
-    && adduser -S -h /home/relayer -D relayer -u 1000
+    && addgroup -g 1000 relayer \
+    && adduser -S -h /home/relayer -D relayer -u 1000 -G relayer
 
-USER relayer
+USER 1000
 WORKDIR /home/relayer
 
 # Create startup script that takes a path as a parameter
-RUN echo 'nohup rly start $1 -p events' > start.sh
+RUN echo 'rly start $1 -p events' > start.sh
 
-# Create a script to updates the light clients so they don't expire
-# Wont be necessary once https://github.com/cosmos/relayer/pull/861 is merged
-RUN <<EOF cat > refresh-clients.sh
-RELAY_PATHS="\$@"
-while true; do
-    for path in \${RELAY_PATHS[@]}; do
-        echo "Updating \$path"
-        rly transact update-clients \$path
-    done
-    sleep 30
-done
-EOF

Dockerfile.stars

@@ -23,9 +23,10 @@ RUN LEDGER_ENABLED=false BUILD_TAGS=muslc LINK_STATICALLY=true make build
 FROM alpine:3.15
 COPY --from=builder /opt/stargaze/bin/starsd /usr/local/bin/
 RUN apk add --update bash vim ca-certificates \
-    && adduser -S -h /home/stars -D stars -u 1000
+    && addgroup -g 1000 stars \
+    && adduser -S -h /home/stars -D stars -u 1000 -G stars
 
-USER stars
+USER 1000
 WORKDIR /home/stars
 
 EXPOSE 26657 26656 1317 9090

Dockerfile.stride

@@ -22,10 +22,11 @@ RUN --mount=type=cache,target=/root/.cache/go-build make build
 # Add to a distroless container
 FROM alpine:3.15
 COPY --from=builder /src/build/strided /usr/local/bin/strided
-RUN addgroup -g 1000 stride \
+RUN apk add bash vim \
+    && addgroup -g 1000 stride \
     && adduser -S -h /home/stride -D stride -u 1000 -G stride
 
-USER stride
+USER 1000
 WORKDIR /home/stride
 
 EXPOSE 26657 26656 1317 9090

Makefile

@@ -105,20 +105,20 @@ test-cover:
 	@go test -mod=readonly -race -coverprofile=coverage.out -covermode=atomic ./x/$(module)/...
 
 test-integration-local:
-	sh scripts-local/tests/run_all_tests.sh
+	bash scripts-local/tests/run_all_tests.sh
 
 test-integration-docker:
-	sh scripts/tests/run_all_tests.sh
+	bash scripts/tests/run_all_tests.sh
 
 ###############################################################################
 ###                                DockerNet                                ###
 ###############################################################################
 
 build-docker: 
-	@sh scripts/build.sh -${build} ${BUILDDIR}
+	@bash scripts/build.sh -${build} ${BUILDDIR}
 
 start-docker: build-docker
-	@sh scripts/start_network.sh 
+	@bash scripts/start_network.sh 
 
 clean-docker: 
 	@docker-compose stop
@@ -127,8 +127,8 @@ clean-docker:
 	docker image prune -a
 
 stop-docker:
-	@pkill -f "docker-compose logs" || true
-	@pkill -f "/bin/bash.*create_logs.sh" || true
+	@-pkill -f "docker-compose logs" 
+	@-pkill -f "/bin/bash.*create_logs.sh" 
 	docker-compose down
 
 ###############################################################################

README.md

@@ -58,7 +58,7 @@ git submodule update --init
 
 Build executables, initialize state, and start the network with
 ```
-make start-docker build=sgjotrhi
+make start-docker build=sgjotr
 ```
 You can optionally pass build arguments to specify which binary to rebuild
 1. `s` This will re-build the Stride binary (default)
@@ -67,7 +67,6 @@ You can optionally pass build arguments to specify which binary to rebuild
 4. `o` This will re-build the Osmo binary
 5. `t` This will re-build the Stargaze binary
 6. `r` This will re-build the Go Relayer binary
-7. `h` This will re-build the Hermes binary
 
 Example: `make start-docker build=sg`, this will:
 - Rebuild the Stride and Gaia binarys

docker-compose.yml

@@ -1,4 +1,4 @@
-version: "3.8"
+version: "3"
 services:
   stride1:
     image: stridezone:stride
@@ -152,27 +152,27 @@ services:
   relayer-gaia:
     image: stridezone:relayer
     volumes:
-      - ./scripts/state/relayer:/home/relayer/.relayer
+      - ./scripts/state/relayer-gaia:/home/relayer/.relayer
     restart: always
     command: [ "bash", "start.sh", "stride-gaia" ]
 
   relayer-juno:
     image: stridezone:relayer
     volumes:
-      - ./scripts/state/relayer:/home/relayer/.relayer
+      - ./scripts/state/relayer-juno:/home/relayer/.relayer
     restart: always
     command: [ "bash", "start.sh", "stride-juno" ]
 
   relayer-osmo:
     image: stridezone:relayer
     volumes:
-      - ./scripts/state/relayer:/home/relayer/.relayer
+      - ./scripts/state/relayer-osmo:/home/relayer/.relayer
     restart: always
     command: [ "bash", "start.sh", "stride-osmo" ]
 
   relayer-stars:
     image: stridezone:relayer
     volumes:
-      - ./scripts/state/relayer:/home/relayer/.relayer
+      - ./scripts/state/relayer-stars:/home/relayer/.relayer
     restart: always
     command: [ "bash", "start.sh", "stride-stars" ]

scripts/README.md

@@ -70,7 +70,10 @@ HERMES_${CHAIN_ID}_MNEMONIC=""
 
 RELAYER_{CHAIN_ID}_EXEC="docker-compose run --rm relayer-{new-host-zone}"
 RELAYER_{CHAIN_ID}_ACCT=rly{add one since the account from the last host zone}
+HOST_RELAYER_ACCTS=(... $RELAYER_{CHAIN_ID}_ACCT)
+
 RELAYER_{CHAIN_ID}_MNEMONIC=""
+RELAYER_MNEMONICS=(...,"$RELAYER_{CHAIN_ID}_MNEMONIC")
 
 ```
 * Add the IBC denom's for the host zone across each channel. You can use the following code block (just temporarily throw it in any of the test files and run it)

scripts/build.sh

@@ -5,6 +5,7 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 source ${SCRIPT_DIR}/vars.sh
 
 BUILDDIR="$2"
+mkdir -p $BUILDDIR
 
 build_local_and_docker() {
    module="$1"
@@ -14,16 +15,27 @@ build_local_and_docker() {
    printf '%s' "Building $title Locally...  "
    cwd=$PWD
    cd $folder
-   go build -mod=readonly -trimpath -o $BUILDDIR ./... 2>&1 | grep -v -E "deprecated|keychain";
-   local_build_succeeded=$?
+   GOBIN=$BUILDDIR go install -mod=readonly -trimpath ./... 2>&1 | grep -v -E "deprecated|keychain" | true
+   local_build_succeeded=${PIPESTATUS[0]}
    cd $cwd
-   echo "Done" 
+
+   if [[ "$local_build_succeeded" == "0" ]]; then
+      echo "Done" 
+   else
+      echo "Failed"
+      return $local_build_succeeded
+   fi
 
    echo "Building $title Docker...  "
-   docker build --tag stridezone:$module -f Dockerfile.$module . 
-   docker_build_succeeded=$?
+   DOCKER_BUILDKIT=1 docker build --tag stridezone:$module -f Dockerfile.$module . | true
+   docker_build_succeeded=${PIPESTATUS[0]}
 
-   return $docker_build_succeeded && $local_build_succeeded
+   if [[ "$docker_build_succeeded" == "0" ]]; then
+      echo "Done" 
+   else
+      echo "Failed"
+   fi
+   return $docker_build_succeeded
 }
 
 ADMINS_FILE=${SCRIPT_DIR}/../utils/admins.go