Skip to content

Commit fc4c931

Browse files
committed
build-sd-images.yml: Fix test setup
Signed-off-by: Tobias Knöppler <[email protected]>
1 parent 93f76ec commit fc4c931

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

.github/workflows/build-sd-images.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -282,20 +282,20 @@ jobs:
282282
echo -e "${LOG_DIAG} /etc/os-release:"
283283
"${CONTAINER_CMD[@]}" -q ncp /bin/bash -c 'cat /etc/os-release'
284284
echo -e "${LOG_DIAG} /usr/local/etc/ncp.cfg:"
285-
"${CONTAINER_CMD[@]}" -q ncp /bin/bash -c 'cat /usr/local/etc/ncp.cfg'
285+
"${CONTAINER_CMD[@]}" --pipe -q ncp /bin/bash -c 'cat /usr/local/etc/ncp.cfg'
286286
cat ./raspbian_root/usr/local/etc/ncp.cfg
287-
echo -e "${LOG_DIAG} /home/ncp-app-bridge confi g ncp"
288-
"${CONTAINER_CMD[@]}" -q ncp /bin/bash -c 'sudo -u www-data sudo /home/www/ncp-app-bridge.sh config ncp'
287+
echo -e "${LOG_DIAG} /home/ncp-app-bridge config ncp"
289288
sudo ls -l ./raspbian_root/home/www/ncp-app-bridge.sh
289+
"${CONTAINER_CMD[@]}" --pipe --uid=33 ncp /bin/bash -c 'sudo /home/www/ncp-app-bridge.sh config ncp'
290290
echo -e "{$LOG_DIAG} Geckodriver logs:"
291291
tail -n 20 geckodriver.log >&2 |& awk "{ print \"${LOG_DIAG} \" \$0 }" || true
292292
echo -e "${LOG_CICD} ================"
293293
echo -e "${LOG_DIAG} ncp.log: "
294-
"${CONTAINER_CMD[@]}" -q ncp /bin/bash -c "tail -n20 /var/log/ncp.log" |& awk "{ print \"${LOG_DIAG} \" \$0 }" || true
294+
"${CONTAINER_CMD[@]}" --pipe ncp /bin/bash -c "tail -n20 /var/log/ncp.log" |& awk "{ print \"${LOG_DIAG} \" \$0 }" || true
295295
echo "================"
296296
echo "${LOG_DIAG} Nextcloud log: "
297-
"${CONTAINER_CMD[@]}" -q ncp /bin/bash -c 'ls -l /opt/ncdata/data/nextcloud.log' |& awk "{ print \"${LOG_DIAG} \" \$0 }" || true
298-
"${CONTAINER_CMD[@]}" -q ncp /bin/bash -c 'cat /opt/ncdata/data/nextcloud.log' |& awk "{ print \"${LOG_DIAG} \" \$0 }" || true
297+
"${CONTAINER_CMD[@]}" --pipe -q ncp /bin/bash -c 'ls -l /opt/ncdata/data/nextcloud.log' |& awk "{ print \"${LOG_DIAG} \" \$0 }" || true
298+
"${CONTAINER_CMD[@]}" --pipe -q ncp /bin/bash -c 'cat /opt/ncdata/data/nextcloud.log' |& awk "{ print \"${LOG_DIAG} \" \$0 }" || true
299299
sudo cat ./raspbian_root/opt/ncdata/data/nextcloud.log |& awk "{ print \"${LOG_DIAG} \" \$0 }"
300300
sleep 12
301301
continue

0 commit comments

Comments
 (0)