Updated to newest GNT2 contracts (lock payment update)

golemfactory · Aug 7, 2024 · 3891382 · 3891382
1 parent 3cc7ef1
commit 3891382
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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",