chore: add logging

FuelLabs · Jan 27, 2025 · 96d04c9 · 96d04c9
1 parent efb6ff2
commit 96d04c9
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 29 deletions.
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -58,16 +58,16 @@ jobs:
   validate:
     runs-on: buildjet-4vcpu-ubuntu-2204
     needs: audit-deps
-    env:
-      # Required for Testcontainers to work in CI
-      TESTCONTAINERS_DOCKER_SOCKET_OVERRIDE: /var/run/docker.sock
-      DOCKER_HOST: unix:///var/run/docker.sock
-      DOCKER_BUILDKIT: 1
-      COMPOSE_DOCKER_CLI_BUILD: 1
-      # Disable Ryuk container to prevent port conflicts
-      TESTCONTAINERS_RYUK_DISABLED: true
-      # Force host networking
-      TESTCONTAINERS_HOST_OVERRIDE: "localhost"
+    # env:
+    #   # Required for Testcontainers to work in CI
+    #   TESTCONTAINERS_DOCKER_SOCKET_OVERRIDE: /var/run/docker.sock
+    #   DOCKER_HOST: unix:///var/run/docker.sock
+    #   DOCKER_BUILDKIT: 1
+    #   COMPOSE_DOCKER_CLI_BUILD: 1
+    #   # Disable Ryuk container to prevent port conflicts
+    #   TESTCONTAINERS_RYUK_DISABLED: true
+    #   # Force host networking
+    #   TESTCONTAINERS_HOST_OVERRIDE: 'localhost'
     steps:
       - uses: actions/checkout@v3
       - uses: FuelLabs/github-actions/setups/node@master

diff --git a/packages/integration-tests/docker-setup/docker.ts b/packages/integration-tests/docker-setup/docker.ts
@@ -1,8 +1,5 @@
-import type {
-  StartedPostgreSqlContainer} from '@testcontainers/postgresql';
-import {
-  PostgreSqlContainer
-} from '@testcontainers/postgresql';
+import type { StartedPostgreSqlContainer } from '@testcontainers/postgresql';
+import { PostgreSqlContainer } from '@testcontainers/postgresql';
 import { exec } from 'child_process';
 import { config as dotEnvConfig } from 'dotenv';
 import * as path from 'path';
@@ -59,30 +56,44 @@ async function startL1ChainContainer(network: StartedNetwork) {
       -f ${dockerfilePath} \
       ${projectRoot}`;
 
-  await execAsync(buildCommand);
+  //   await execAsync(buildCommand);
+
+  try {
+    const { stdout, stderr } = await execAsync(buildCommand);
+    console.log('Docker build output:');
+    console.log('stdout:', stdout);
+    if (stderr) {
+      console.error('stderr:', stderr);
+    }
+  } catch (error) {
+    console.error('Docker build error:', error);
+    throw error;
+  }
 
   const container = await new GenericContainer(IMAGE_NAME)
     .withExposedPorts(
       { host: 8545, container: 9545 },
-    //   { host: 8080, container: 8081 }
+      { host: 8080, container: 8081 }
     )
-    .withNetwork(network)
-    .withNetworkAliases('l1_chain')
-    .withName('l1_chain')
-    .withEnvironment({
-      TENDERLY_RPC_URL: process.env.TENDERLY_RPC_URL
-        ? process.env.TENDERLY_RPC_URL
-        : '',
-    })
+    // .withNetwork(network)
+    // .withNetworkAliases('l1_chain')
+    // .withName('l1_chain')
+    // .withEnvironment({
+    //   TENDERLY_RPC_URL: process.env.TENDERLY_RPC_URL
+    //     ? process.env.TENDERLY_RPC_URL
+    //     : '',
+    // })
     // .withStartupTimeout(120000)
     .withWaitStrategy(
-        Wait.forAll([
-          Wait.forListeningPorts(),
+      Wait.forAll([
+        Wait.forListeningPorts(),
         //   Wait.forLogMessage('Server is running at https://localhost:8081'),
-        ])
-      )
+      ])
+    )
     .start();
 
+  console.log(container.logs);
+
   return container;
 }