Merge branch 'main' of github.com:worldcoin/orb-software into oes-event-listener

Author: vmenge

orb-connd/tests/docker/Dockerfile

@@ -19,8 +19,13 @@ RUN ZENOH_VERSION="1.7.2" && \
     fi && \
     wget -O /tmp/zenoh.zip "https://www.eclipse.org/downloads/download.php?file=/zenoh/zenoh/${ZENOH_VERSION}/zenoh-${ZENOH_VERSION}-${ARCH}-unknown-linux-gnu-debian.zip&r=1" && \
     unzip /tmp/zenoh.zip -d /tmp/zenoh && \
-    dpkg -i /tmp/zenoh/zenohd_${ZENOH_VERSION}_${DEB_ARCH}.deb /tmp/zenoh/zenoh-plugin-storage-manager_${ZENOH_VERSION}_${DEB_ARCH}.deb || true && \
-    rm -rf /tmp/zenoh.zip /tmp/zenoh
+    apt-get update && \
+    printf '%s\n' '#!/bin/sh' 'exit 0' > /usr/local/bin/systemctl && chmod +x /usr/local/bin/systemctl && \
+    dpkg -i /tmp/zenoh/zenohd_${ZENOH_VERSION}_${DEB_ARCH}.deb /tmp/zenoh/zenoh-plugin-storage-manager_${ZENOH_VERSION}_${DEB_ARCH}.deb || \
+    apt-get install -f -y --no-install-recommends && \
+    rm -f /usr/local/bin/systemctl && \
+    rm -rf /var/lib/apt/lists/* /tmp/zenoh.zip /tmp/zenoh && \
+    zenohd --version
 
 RUN mkdir -p /run/integration-tests
 

test-utils/src/docker.rs

@@ -10,7 +10,7 @@ pub async fn build(
     dockerfile: impl AsRef<Path>,
     context: impl AsRef<Path>,
 ) -> Output {
-    tokio::process::Command::new("docker")
+    let out = tokio::process::Command::new("docker")
         .arg("build")
         .arg("-t")
         .arg(tag)
@@ -19,7 +19,17 @@ pub async fn build(
         .arg(context.as_ref().to_str().unwrap())
         .output()
         .await
-        .unwrap()
+        .unwrap();
+
+    if !out.status.success() {
+        panic!(
+            "docker build failed:\n{}{}",
+            String::from_utf8_lossy(&out.stdout),
+            String::from_utf8_lossy(&out.stderr),
+        );
+    }
+
+    out
 }
 
 /// Starts a container with a temporary directory mounted to /run/integration-tests

zenorb/tests/Dockerfile

@@ -16,8 +16,11 @@ RUN ZENOH_VERSION="1.7.2" && \
     fi && \
     wget -O /tmp/zenoh.zip "https://www.eclipse.org/downloads/download.php?file=/zenoh/zenoh/${ZENOH_VERSION}/zenoh-${ZENOH_VERSION}-${ARCH}-unknown-linux-gnu-debian.zip&r=1" && \
     unzip /tmp/zenoh.zip -d /tmp/zenoh && \
-    dpkg -i /tmp/zenoh/zenohd_${ZENOH_VERSION}_${DEB_ARCH}.deb /tmp/zenoh/zenoh-plugin-storage-manager_${ZENOH_VERSION}_${DEB_ARCH}.deb || true && \
-    rm -rf /tmp/zenoh.zip /tmp/zenoh
+    apt-get update && \
+    dpkg -i /tmp/zenoh/zenohd_${ZENOH_VERSION}_${DEB_ARCH}.deb /tmp/zenoh/zenoh-plugin-storage-manager_${ZENOH_VERSION}_${DEB_ARCH}.deb || \
+    apt-get install -f -y --no-install-recommends && \
+    rm -rf /var/lib/apt/lists/* /tmp/zenoh.zip /tmp/zenoh && \
+    zenohd --version
 
 COPY zenohd.json5 /etc/zenohd.json5