Dockerfile

@@ -24,6 +24,6 @@ RUN make PREFIX=/opt/compile-r7rs build
 RUN make PREFIX=/opt/compile-r7rs install
 
 FROM schemers/chibi
-RUN apt-get update && apt-get install -y podman-docker make
+RUN apt-get update && apt-get install -y docker.io podman make
 COPY --from=build /opt/compile-r7rs /opt/compile-r7rs
 ENV PATH=/opt/compile-r7rs/bin:${PATH}

test-r7rs.scm

@@ -277,16 +277,9 @@
       (when (file-exists? build-out) (delete-file build-out))
       (when (file-exists? run-out) (delete-file run-out))
       (when (not (= (system docker-build-cmd) 0))
-        (display "Docker container build failed")
-        (newline)
-        (display "Command: ")
-        (display docker-build-cmd)
-        (newline)
-        (display "Output: ")
-        (newline)
-        (cat docker-build-out)
-        (newline)
-        (exit 1))
+        (error (string-append "Docker container build failed, see output in "
+                              docker-build-out)
+               docker-build-cmd))
       (let* ((build-exit-code (number->string (system build-cmd)))
              (run-exit-code (number->string (system run-cmd)))
              (testname (if (and (string? run-exit-code)