From 2cd6149c45f28f40f24defb34159ebc84fa2b1ae Mon Sep 17 00:00:00 2001
From: Lucas Caudill <lcaudill@lanl.gov>
Date: Thu, 18 Jul 2024 17:39:59 +0000
Subject: [PATCH] fix CI

---
 lib/modify.py            |  1 -
 test/build/55_cache.bats | 13 ++++---------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/lib/modify.py b/lib/modify.py
index 219241007..2d484ba11 100644
--- a/lib/modify.py
+++ b/lib/modify.py
@@ -184,7 +184,6 @@ def modify_tree_make(src_img, cmds):
                          ], meta))
    return im.Tree(lark.Token('RULE', 'start'), [im.Tree(lark.Token('RULE','dockerfile'), df_children)], meta)
 
-# FIXME: Combine with “modify_tree_make”?
 def modify_tree_make_script(src_img, path):
    """Temporary(?) analog of “modify_tree_make” for the non-interactive version
       of “modify” using a script. For the command line:
diff --git a/test/build/55_cache.bats b/test/build/55_cache.bats
index 22d8e07d3..7de25d4ab 100644
--- a/test/build/55_cache.bats
+++ b/test/build/55_cache.bats
@@ -1606,12 +1606,12 @@ EOF
     ch-image modify alpine:3.17 tmpimg "${BATS_TMPDIR}/script.sh"
 
     blessed_out=$(cat <<EOF
-*  (tmpimg) RUN.S /ch/script.sh
+*  (tmpimg) RUN.S /bin/sh /ch/script.sh
 *  COPY ['${BATS_TMPDIR}/script.sh'] -> '/ch/script.sh'
 | *  RUN.S echo bar
 | *  RUN.S echo foo
+| *  SHELL ['/bin/sh', '-c']
 |/
-*  SHELL ['/bin/sh', '-c']
 *  (alpine+3.17) PULL alpine:3.17
 *  (root) ROOT
 EOF
@@ -1622,17 +1622,12 @@ EOF
     [[ $status -eq 0 ]]
     diff -u <(echo "$blessed_out") <(echo "$output" | treeonly)
 
+    ch-image build-cache --reset
+    ch-image pull alpine:3.17
     printf 'echo hello\nexit\n' | ch-image modify -i alpine:3.17 tmpimg
 
     blessed_out=$(cat <<EOF
 *  (tmpimg) MODIFY interactive
-| *  RUN.S /ch/script.sh
-| *  COPY ['${BATS_TMPDIR}/script.sh'] -> '/ch/script.sh'
-| | *  RUN.S echo bar
-| | *  RUN.S echo foo
-| |/
-| *  SHELL ['/bin/sh', '-c']
-|/
 *  (alpine+3.17) PULL alpine:3.17
 *  (root) ROOT
 EOF