diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 3973fc9b..c5d02eb8 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -11,7 +11,7 @@ on: jobs: integration-test: name: Run integration tests - runs-on: [ubuntu-latest] + runs-on: [ubuntu-22.04] strategy: matrix: diff --git a/goth/default-assets/docker/docker-compose.yml b/goth/default-assets/docker/docker-compose.yml index bdab16f0..bb59a93b 100644 --- a/goth/default-assets/docker/docker-compose.yml +++ b/goth/default-assets/docker/docker-compose.yml @@ -27,17 +27,17 @@ services: - "host.docker.internal:host-gateway" ethereum-mainnet: - image: ghcr.io/golemfactory/gnt2/gnt2-docker-yagna:77ce4d49def1 + image: ghcr.io/golemfactory/gnt2/gnt2-docker-yagna:4c020aca5a0d environment: - GANACHE_CHAIN_ID=1 ethereum-holesky: - image: ghcr.io/golemfactory/gnt2/gnt2-docker-yagna:77ce4d49def1 + image: ghcr.io/golemfactory/gnt2/gnt2-docker-yagna:4c020aca5a0d environment: - GANACHE_CHAIN_ID=17000 ethereum-polygon: - image: ghcr.io/golemfactory/gnt2/gnt2-docker-yagna:77ce4d49def1 + image: ghcr.io/golemfactory/gnt2/gnt2-docker-yagna:4c020aca5a0d environment: - GANACHE_CHAIN_ID=137 diff --git a/goth/runner/container/compose.py b/goth/runner/container/compose.py index 7f18b38b..49ce0fca 100644 --- a/goth/runner/container/compose.py +++ b/goth/runner/container/compose.py @@ -109,7 +109,7 @@ async def start_network( # Stop the network in case it's already running (e.g. from a previous test) await self.stop_network() - command = ["docker-compose", "-f", str(self.config.file_path), "up", "-d"] + command = ["docker", "compose", "-f", str(self.config.file_path), "up", "-d"] await build_yagna_image(self.config.build_env) await build_proxy_image(self.config.build_env.docker_dir) @@ -186,7 +186,8 @@ async def stop_network(self, compose_containers: Optional[List[str]] = None): self._disconnect_containers(compose_containers or []) compose_down_cmd = [ - "docker-compose", + "docker", + "compose", "-f", str(self.config.file_path), "down",