diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index 92c4b1d3d..219e7b471 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -26,7 +26,7 @@ jobs: strategy: matrix: build-type: [ "explorers", "faucet", "relayers", "starship" ] - max-parallel: 2 + max-parallel: 4 env: DOCKER_REPO: ghcr.io/cosmology-tech/starship @@ -54,10 +54,15 @@ jobs: ./scripts/build-docker.sh --type ${{ matrix.build-type }} --process all --version all - name: Build and push - if: github.event_name == 'push' || github.event_name == 'workflow_dispatch' + if: github.event_name == 'push' run: | ./scripts/build-docker.sh --type ${{ matrix.build-type }} --process all --version all --push + - name: Force Build and Push for workflow dispatch + if: github.event_name == 'workflow_dispatch' + run: | + ./scripts/build-docker.sh --type ${{ matrix.build-type }} --process all --version all --push --force + build-push-chains: runs-on: ubuntu-latest @@ -90,6 +95,11 @@ jobs: cd docker/chains && ./build-docker-chains.sh --chain all --tag all - name: Build and push all chains - if: github.event_name == 'push' || github.event_name == 'workflow_dispatch' + if: github.event_name == 'push' run: | cd docker/chains && ./build-docker-chains.sh --chain all --tag all --push + + - name: Force Build and Push for workflow dispatch + if: github.event_name == 'workflow_dispatch' + run: | + cd docker/chains && ./build-docker-chains.sh --chain all --tag all --push --force diff --git a/charts/devnet/Chart.yaml b/charts/devnet/Chart.yaml index 490e366a9..febd391b7 100644 --- a/charts/devnet/Chart.yaml +++ b/charts/devnet/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.35 +version: 0.1.36 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/charts/devnet/values.yaml b/charts/devnet/values.yaml index 1229c4a11..a705ef87b 100644 --- a/charts/devnet/values.yaml +++ b/charts/devnet/values.yaml @@ -42,7 +42,7 @@ exposer: memory: "200M" faucet: - image: ghcr.io/cosmology-tech/starship/cosmjs-faucet:v0.30.1 + image: ghcr.io/cosmology-tech/starship/cosmjs-faucet:v0.31.0 ports: rest: 8000 resources: @@ -348,7 +348,7 @@ explorer: # Flag to enable explorer for cluster enabled: false type: ping-pub - image: ghcr.io/cosmology-tech/starship/ping-pub:6437369d84c374ee357370a219508948e605f7cc + image: ghcr.io/cosmology-tech/starship/ping-pub:6b7b0d096946b6bcd75d15350c7345da0d4576db localhost: true ports: rest: 8080 diff --git a/docker/chains/build-docker-chains.sh b/docker/chains/build-docker-chains.sh index e86a64125..0423f72e9 100755 --- a/docker/chains/build-docker-chains.sh +++ b/docker/chains/build-docker-chains.sh @@ -16,6 +16,15 @@ function color() { printf "\033[%sm%s\033[0m\n" "$color_code" "$*" } +function set_docker_buildx() { + set +e + out=$(docker buildx create --name chain-builder --use > /dev/null 2>&1) + if [[ $? -ne 0 ]]; then + docker buildx use chain-builder + fi + set -e +} + function image_tag_exists() { local image=$1 local tag=$2 @@ -58,7 +67,7 @@ build_chain_tag() { color yellow "building docker image $DOCKER_REPO/$chain:$tag for chain $chain" for n in {1..3}; do docker buildx build \ - --platform linux/amd64 \ + --platform linux/amd64,linux/arm64 \ -t "$DOCKER_REPO/$chain:$tag" \ . -f Dockerfile \ --build-arg BASE_IMAGE=$base \ @@ -130,6 +139,7 @@ while [ $# -gt 0 ]; do esac done +set_docker_buildx if [[ $CHAIN == "all" ]]; then build_all_chains $PUSH diff --git a/docker/chains/versions.yaml b/docker/chains/versions.yaml index 3b8325edd..b5bfd1475 100644 --- a/docker/chains/versions.yaml +++ b/docker/chains/versions.yaml @@ -2,6 +2,7 @@ chains: - name: osmosis base: ghcr.io/strangelove-ventures/heighliner/osmosis tags: + - v15.1.2-wasmvm1.2.3 - v15.1.2 - v15.1.2-wasmvm1.1.2 - v15.1.0 diff --git a/docker/explorers/ping-pub/Dockerfile b/docker/explorers/ping-pub/Dockerfile index 1cb615445..4405f8ee9 100644 --- a/docker/explorers/ping-pub/Dockerfile +++ b/docker/explorers/ping-pub/Dockerfile @@ -20,7 +20,7 @@ RUN cd /tmp && unzip ${VERSION##*/}.zip && mv /tmp/${CODE_NAME}-${VERSION##*/}/* RUN echo "*.js\nsrc/\n" > .eslintignore RUN rm -rf node_modules -RUN yarn install --frozen-lockfile +RUN yarn install --no-lockfile --network-timeout 100000 EXPOSE 8080 ENTRYPOINT ["yarn", "serve"] diff --git a/docker/explorers/ping-pub/versions.yaml b/docker/explorers/ping-pub/versions.yaml index 8d656d7f8..39bd6b1ab 100644 --- a/docker/explorers/ping-pub/versions.yaml +++ b/docker/explorers/ping-pub/versions.yaml @@ -1,4 +1,5 @@ base: node:16 versions: - refs/heads/master + - 6b7b0d096946b6bcd75d15350c7345da0d4576db - 6437369d84c374ee357370a219508948e605f7cc diff --git a/docker/faucet/cosmjs-faucet/Dockerfile b/docker/faucet/cosmjs-faucet/Dockerfile index 183304b86..ba989f515 100644 --- a/docker/faucet/cosmjs-faucet/Dockerfile +++ b/docker/faucet/cosmjs-faucet/Dockerfile @@ -18,7 +18,8 @@ RUN rm -rf cosmjs.tar.gz RUN apk add --update --no-cache alpine-sdk linux-headers build-base gcc libusb-dev python3 py3-pip eudev-dev nodejs yarn RUN ln -sf python3 /usr/bin/python -RUN yarn cache clean --all && yarn install && yarn run build +RUN yarn cache clean --all && rm yarn.lock && yarn install --network-timeout 100000 +RUN yarn run build RUN (cd packages/faucet && SKIP_BUILD=1 yarn pack-node) # Use Alpine and install Node.js which is 50% smaller than the -alpine version of the node @@ -37,4 +38,3 @@ WORKDIR /app EXPOSE 8000 ENTRYPOINT ["/app/packages/faucet/bin/cosmos-faucet-dist"] - diff --git a/docker/faucet/cosmjs-faucet/versions.yaml b/docker/faucet/cosmjs-faucet/versions.yaml index 644f48ad5..0b8604237 100644 --- a/docker/faucet/cosmjs-faucet/versions.yaml +++ b/docker/faucet/cosmjs-faucet/versions.yaml @@ -1,7 +1,6 @@ base: node:16-alpine versions: - - v0.31.0-alpha.2 - - v0.31.0-alpha.1 + - v0.31.0 - v0.30.1 - v0.30.0 - v0.29.5 diff --git a/docker/relayers/hermes/versions.yaml b/docker/relayers/hermes/versions.yaml index 615ea07cc..604315b0d 100644 --- a/docker/relayers/hermes/versions.yaml +++ b/docker/relayers/hermes/versions.yaml @@ -2,8 +2,3 @@ base: informalsystems/hermes versions: - 1.5.1 - 1.5.0 - - 1.4.1 - - 1.4.0 - - 1.3.0 - - 1.2.0 - - 1.1.0 diff --git a/docs/pages/get-started/step-3.mdx b/docs/pages/get-started/step-3.mdx index e7b5be295..b586b3696 100644 --- a/docs/pages/get-started/step-3.mdx +++ b/docs/pages/get-started/step-3.mdx @@ -11,7 +11,7 @@ Run ```bash helm repo add starship https://cosmology-tech.github.io/starship/ helm repo update -helm search repo starship/devnet --version 0.1.31 +helm search repo starship/devnet --version 0.1.36 ``` ## 3.2) Define the desired infrastructure diff --git a/examples/cosmos-simapp-multi/Makefile b/examples/cosmos-simapp-multi/Makefile index dda2ca2db..181d2e617 100644 --- a/examples/cosmos-simapp-multi/Makefile +++ b/examples/cosmos-simapp-multi/Makefile @@ -3,7 +3,7 @@ FILE = configs/local.yaml HELM_REPO = starship HELM_CHART = devnet -HELM_VERSION = v0.1.35 +HELM_VERSION = v0.1.36 ############################################################################### ### All commands ### diff --git a/examples/getting-started/Makefile b/examples/getting-started/Makefile index 085359726..2c58a2605 100644 --- a/examples/getting-started/Makefile +++ b/examples/getting-started/Makefile @@ -4,7 +4,7 @@ TINY_FILE = configs/tiny-starship.yaml HELM_REPO = starship HELM_CHART = devnet -HELM_VERSION = v0.1.34 +HELM_VERSION = v0.1.36 ############################################################################### ### All commands ### diff --git a/examples/multi-chain/Makefile b/examples/multi-chain/Makefile index 0795eb727..1a33919fe 100644 --- a/examples/multi-chain/Makefile +++ b/examples/multi-chain/Makefile @@ -3,7 +3,7 @@ FILE = config.yaml HELM_REPO = starship HELM_CHART = devnet -HELM_VERSION = v0.1.34 +HELM_VERSION = v0.1.36 ############################################################################### ### All commands ### diff --git a/examples/osmojs/Makefile b/examples/osmojs/Makefile index 4911d6bde..03c795bba 100644 --- a/examples/osmojs/Makefile +++ b/examples/osmojs/Makefile @@ -2,7 +2,7 @@ HELM_NAME = osmojs HELM_FILE = configs/config.yaml HELM_REPO = starship HELM_CHART = devnet -HELM_VERSION = v0.1.34 +HELM_VERSION = v0.1.36 ############################################################################### ### All commands ### diff --git a/scripts/build-docker.sh b/scripts/build-docker.sh index 96626c012..1e3c69e68 100755 --- a/scripts/build-docker.sh +++ b/scripts/build-docker.sh @@ -19,6 +19,15 @@ function color() { printf "\033[%sm%s\033[0m\n" "$color_code" "$*" } +function set_docker_buildx() { + set +e + out=$(docker buildx create --name chain-builder --use > /dev/null 2>&1) + if [[ $? -ne 0 ]]; then + docker buildx use chain-builder + fi + set -e +} + function is_directory { if [ -d "$1" ]; then return 0 # true @@ -86,7 +95,8 @@ docker_process_build() { if [[ "$push_image" != "push-only" ]]; then color yellow "building docker image $DOCKER_REPO/$process:$tag from file $DOCKER_DIR/$type/$process/Dockerfile" for n in {1..3}; do - docker buildx build --platform linux/amd64 \ + docker buildx build \ + --platform linux/amd64,linux/arm64 \ -t "$DOCKER_REPO/$process:$tag" . \ --build-arg BASE_IMAGE=$base \ --build-arg VERSION=$version \ @@ -185,6 +195,8 @@ while [ $# -gt 0 ]; do esac done +set_docker_buildx + if [[ $TYPE == "all" ]]; then build_all_types "all" "all" "all" $PUSH $PUSH_LATEST exit 0