diff --git a/.github/packer/aws-ubuntu-docker.pkr.hcl b/.github/packer/aws-ubuntu-docker.pkr.hcl index 911547560..65e48a857 100644 --- a/.github/packer/aws-ubuntu-docker.pkr.hcl +++ b/.github/packer/aws-ubuntu-docker.pkr.hcl @@ -130,8 +130,8 @@ build { "docker pull prom/node-exporter:v1.7.0", "docker pull grafana/grafana:10.4.1", "docker pull prom/prometheus:v2.51.2", - "docker pull avaplatform/awm-relayer", - "docker pull golang:1.22.1-bullseye" + "docker pull avaplatform/icm-relayer:v2.0.0-fuji", + "docker pull golang:1.22.8-bullseye" ] } diff --git a/cmd/nodecmd/wiz.go b/cmd/nodecmd/wiz.go index f5316a2e0..0a875d963 100644 --- a/cmd/nodecmd/wiz.go +++ b/cmd/nodecmd/wiz.go @@ -328,7 +328,7 @@ func wiz(cmd *cobra.Command, args []string) error { if err != nil { return err } - // get awm-relayer latest version + // get icm-relayer latest version relayerVersion, err := teleporter.GetLatestRelayerReleaseVersion() if err != nil { return err diff --git a/pkg/docker/templates/awmrelayer.docker-compose.yml b/pkg/docker/templates/awmrelayer.docker-compose.yml index 2b6650c2e..e0aa27cd9 100644 --- a/pkg/docker/templates/awmrelayer.docker-compose.yml +++ b/pkg/docker/templates/awmrelayer.docker-compose.yml @@ -1,11 +1,11 @@ name: avalanche-cli services: - awm-relayer: - image: avaplatform/awm-relayer:{{ .ICMRelayerVersion }} - container_name: awm-relayer + icm-relayer: + image: avaplatform/icm-relayer:{{ .ICMRelayerVersion }} + container_name: icm-relayer restart: unless-stopped user: "1000:1000" # ubuntu user network_mode: "host" volumes: - - /home/ubuntu/.avalanche-cli/services/awm-relayer:/.awm-relayer:rw - command: 'awm-relayer --config-file /.awm-relayer/awm-relayer-config.json' + - /home/ubuntu/.avalanche-cli/services/icm-relayer:/.icm-relayer:rw + command: 'icm-relayer --config-file /.icm-relayer/icm-relayer-config.json' diff --git a/pkg/remoteconfig/avalanche.go b/pkg/remoteconfig/avalanche.go index 777539fe9..a74c1782a 100644 --- a/pkg/remoteconfig/avalanche.go +++ b/pkg/remoteconfig/avalanche.go @@ -123,6 +123,6 @@ func AvalancheFolderToCreate() []string { "/home/ubuntu/.avalanchego/configs/chains/C", "/home/ubuntu/.avalanchego/staking", "/home/ubuntu/.avalanchego/plugins", - "/home/ubuntu/.avalanche-cli/services/awm-relayer", + "/home/ubuntu/.avalanche-cli/services/icm-relayer", } } diff --git a/pkg/ssh/ssh.go b/pkg/ssh/ssh.go index 60260ca2f..8eab79c10 100644 --- a/pkg/ssh/ssh.go +++ b/pkg/ssh/ssh.go @@ -164,17 +164,17 @@ func ComposeSSHSetupICMRelayer(host *models.Host, relayerVersion string) error { if err := docker.ComposeSSHSetupICMRelayer(host, relayerVersion); err != nil { return err } - return docker.StartDockerComposeService(host, utils.GetRemoteComposeFile(), "awm-relayer", constants.SSHLongRunningScriptTimeout) + return docker.StartDockerComposeService(host, utils.GetRemoteComposeFile(), "icm-relayer", constants.SSHLongRunningScriptTimeout) } // RunSSHStartICMRelayerService runs script to start an AWM Relayer Service func RunSSHStartICMRelayerService(host *models.Host) error { - return docker.StartDockerComposeService(host, utils.GetRemoteComposeFile(), "awm-relayer", constants.SSHLongRunningScriptTimeout) + return docker.StartDockerComposeService(host, utils.GetRemoteComposeFile(), "icm-relayer", constants.SSHLongRunningScriptTimeout) } // RunSSHStopICMRelayerService runs script to start an AWM Relayer Service func RunSSHStopICMRelayerService(host *models.Host) error { - return docker.StopDockerComposeService(host, utils.GetRemoteComposeFile(), "awm-relayer", constants.SSHLongRunningScriptTimeout) + return docker.StopDockerComposeService(host, utils.GetRemoteComposeFile(), "icm-relayer", constants.SSHLongRunningScriptTimeout) } // RunSSHUpgradeAvalanchego runs script to upgrade avalanchego