From 56fadf26362042b7ebcf95425e8cd3f3fb6a0a57 Mon Sep 17 00:00:00 2001
From: James Walker <walkah@walkah.net>
Date: Mon, 18 Nov 2024 23:39:13 -0500
Subject: [PATCH] fix errors

---
 docker/docker-compose.dev.yml       | 6 +++++-
 docker/docker-compose.yml           | 6 +++---
 docker/resource-provider/Dockerfile | 4 ++++
 pkg/executor/bacalhau/bacalhau.go   | 2 +-
 stack                               | 1 +
 5 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml
index e46b11cf..8de2f4ef 100644
--- a/docker/docker-compose.dev.yml
+++ b/docker/docker-compose.dev.yml
@@ -37,7 +37,7 @@ services:
       timeout: 10s
       retries: 5
   ipfs:
-    image: ipfs/kubo:v0.32.0
+    image: ipfs/kubo:v0.32.1
     container_name: ipfs
     restart: unless-stopped
     ports:
@@ -56,6 +56,8 @@ services:
       dockerfile: ./docker/bacalhau/Dockerfile
     extra_hosts:
       - "localhost:host-gateway"
+    environment:
+      - BACALHAU_ENVIRONMENT=local
     command:
       [
         "serve",
@@ -119,6 +121,8 @@ services:
     container_name: resource-provider
     restart: unless-stopped
     depends_on:
+      ipfs:
+        condition: service_healthy
       solver:
         condition: service_healthy
       bacalhau:
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 6d3fd645..fcda47e9 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -1,7 +1,7 @@
 # This is a docker-compose file for use by Resource Providers
 services:
   ipfs:
-    image: ipfs/kubo:v0.32.0
+    image: ipfs/kubo:v0.32.1
     container_name: ipfs
     restart: unless-stopped
     ports:
@@ -17,8 +17,8 @@ services:
     depends_on:
       ipfs:
         condition: service_healthy
-    extra_hosts:
-      - "localhost:host-gateway"
+    environment:
+      - BACALHAU_ENVIRONMENT=local
     command:
       [
         "serve",
diff --git a/docker/resource-provider/Dockerfile b/docker/resource-provider/Dockerfile
index 9e5fb9b7..5c5f3b45 100644
--- a/docker/resource-provider/Dockerfile
+++ b/docker/resource-provider/Dockerfile
@@ -47,6 +47,10 @@ ENV PATH="/usr/local/bin:${PATH}"
 RUN touch run
 RUN echo "#!/bin/bash" >> run
 
+# Ensure bacalhau is initialized
+RUN echo "export BACALHAU_ENVIRONMENT=local" >> run
+RUN echo "bacalhau id" >> run
+
 # Launch Lilypad
 RUN echo "/usr/local/bin/lilypad resource-provider --network ${NETWORK} --disable-pow=${DISABLE_POW} --disable-telemetry=${DISABLE_TELEMETRY} &" >> run
 RUN echo "wait -n" >> run
diff --git a/pkg/executor/bacalhau/bacalhau.go b/pkg/executor/bacalhau/bacalhau.go
index adc2abee..db01e3ef 100644
--- a/pkg/executor/bacalhau/bacalhau.go
+++ b/pkg/executor/bacalhau/bacalhau.go
@@ -208,7 +208,7 @@ func (executor *BacalhauExecutor) getJobID(
 	outputError := strings.Join(strings.Fields(strings.Join(splitOutputs[1:], " ")), " ")
 
 	if outputError != "" {
-		return "", fmt.Errorf("error running command %s -> %s, %s", deal.ID, outputError, runOutput)
+		log.Error().Msgf("error parsing output %s -> %s, %s", deal.ID, outputError, runOutput)
 	}
 
 	id := strings.TrimSpace(string(runOutput))
diff --git a/stack b/stack
index 0515e499..2e616df5 100755
--- a/stack
+++ b/stack
@@ -312,6 +312,7 @@ function resource-provider-docker-run() {
 
 function bacalhau-node(){
   export BACALHAU_SERVE_IPFS_PATH=/tmp/lilypad/data/ipfs
+  export BACALHAU_ENVIRONMENT=local
   export LOG_LEVEL=debug
   bacalhau serve --node-type compute,requester --peer none --private-internal-ipfs=false --job-selection-accept-networked --ipfs-connect "/ip4/127.0.0.1/tcp/5001"
 }