diff --git a/changelog.md b/changelog.md index d2ef8e8670..08e6ee0d26 100644 --- a/changelog.md +++ b/changelog.md @@ -30,6 +30,8 @@ of the demo node for reference. * `pallet-session-validator-management` is no longer configured with a `CommitteeMember` type and instead uses `sp_session_validator_management::CommitteeMember` type directly. As this type was the only type supported by the toolkit, this change is backwards compatible for existing chains. +* `local-environment` now runs the cardano-node with OS platform instead of fixing to AMD by using +multiarch image. ## Removed diff --git a/dev/local-environment/configurations/cardano/entrypoint.sh b/dev/local-environment/configurations/cardano/entrypoint.sh index 14aa934edc..25697cb0e4 100644 --- a/dev/local-environment/configurations/cardano/entrypoint.sh +++ b/dev/local-environment/configurations/cardano/entrypoint.sh @@ -29,10 +29,10 @@ cp /shared/conway/genesis.conway.json.base /shared/conway/genesis.conway.json cp /shared/shelley/genesis.alonzo.json.base /shared/shelley/genesis.alonzo.json echo "Created /shared/conway/genesis.conway.json and /shared/shelley/genesis.alonzo.json" -byron_hash=$(/bin/cardano-cli byron genesis print-genesis-hash --genesis-json /shared/byron/genesis.json) -shelley_hash=$(/bin/cardano-cli latest genesis hash --genesis /shared/shelley/genesis.json) -alonzo_hash=$(/bin/cardano-cli latest genesis hash --genesis /shared/shelley/genesis.alonzo.json) -conway_hash=$(/bin/cardano-cli latest genesis hash --genesis /shared/conway/genesis.conway.json) +byron_hash=$(cardano-cli byron genesis print-genesis-hash --genesis-json /shared/byron/genesis.json) +shelley_hash=$(cardano-cli latest genesis hash --genesis /shared/shelley/genesis.json) +alonzo_hash=$(cardano-cli latest genesis hash --genesis /shared/shelley/genesis.alonzo.json) +conway_hash=$(cardano-cli latest genesis hash --genesis /shared/conway/genesis.conway.json) /busybox sed "s/\"ByronGenesisHash\": \"[^\"]*\"/\"ByronGenesisHash\": \"$byron_hash\"/" /shared/node-1-config.json.base > /shared/node-1-config.json.base.byron /busybox sed "s/\"ByronGenesisHash\": \"[^\"]*\"/\"ByronGenesisHash\": \"$byron_hash\"/" /shared/db-sync-config.json.base > /shared/db-sync-config.json.base.byron diff --git a/dev/local-environment/modules/cardano.txt b/dev/local-environment/modules/cardano.txt index d38d4d9fb8..3b68153381 100644 --- a/dev/local-environment/modules/cardano.txt +++ b/dev/local-environment/modules/cardano.txt @@ -2,7 +2,6 @@ cardano-node-1: container_name: cardano-node-1 image: ${CARDANO_IMAGE} - platform: linux/amd64 volumes: - cardano-node-1-data:/data - shared-volume:/shared diff --git a/dev/local-environment/setup.sh b/dev/local-environment/setup.sh index fee18cf16a..1a7abd36d9 100755 --- a/dev/local-environment/setup.sh +++ b/dev/local-environment/setup.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash PARTNER_CHAINS_NODE_IMAGE="ghcr.io/input-output-hk/partner-chains/partner-chains-node-unstable:latest" -CARDANO_IMAGE="ghcr.io/intersectmbo/cardano-node:10.5.1" +CARDANO_IMAGE="ghcr.io/blinklabs-io/cardano-node:10.5.1" DBSYNC_IMAGE="ghcr.io/intersectmbo/cardano-db-sync:13.6.0.5" DOLOS_IMAGE="ghcr.io/txpipe/dolos:1.0.0-beta.8" OGMIOS_IMAGE="cardanosolutions/ogmios:v6.13.0"