[taler-merchant] branch master updated: ci: drop docker support from local ci script

[gnunet]

This is an automated email from the git hooks/post-receive script.

devan-carpenter pushed a commit to branch master
in repository merchant.

The following commit(s) were added to refs/heads/master by this push:
     new a5366e16 ci: drop docker support from local ci script
a5366e16 is described below

commit a5366e168023535867c67fa81aeff15addf184e6
Author: Devan Carpenter <devan@taler.net>
AuthorDate: Wed Jan 17 08:06:07 2024 -0500

    ci: drop docker support from local ci script
---
 contrib/ci/ci.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/contrib/ci/ci.sh b/contrib/ci/ci.sh
index 47c7a211..0719015b 100755
--- a/contrib/ci/ci.sh
+++ b/contrib/ci/ci.sh
@@ -1,16 +1,16 @@
 #!/bin/bash
 set -exvuo pipefail
 
-# Use podman if available, otherwise use docker.
-# Fails if neither is found in PATH
-OCI_RUNTIME=$(which podman || which docker)
+# Requires podman
+# Fails if not found in PATH
+OCI_RUNTIME=$(which podman)
 REPO_NAME=$(basename "${PWD}")
 JOB_NAME="${1}"
-JOB_CONTAINER=$((grep CONTAINER_NAME contrib/ci/jobs/${JOB_NAME}/config.ini | 
cut -d' ' -f 3) || echo "${REPO_NAME}")
 JOB_ARCH=$((grep CONTAINER_ARCH contrib/ci/jobs/${JOB_NAME}/config.ini | cut 
-d' ' -f 3) || echo "${2:-amd64}")
+JOB_CONTAINER=$((grep CONTAINER_NAME contrib/ci/jobs/${JOB_NAME}/config.ini | 
cut -d' ' -f 3) || echo "localhost/${REPO_NAME}:${JOB_ARCH}")
 CONTAINER_BUILD=$((grep CONTAINER_BUILD contrib/ci/jobs/${JOB_NAME}/config.ini 
| cut -d' ' -f 3) || echo "True")
 
-echo "${JOB_CONTAINER}"
+echo "Image name: ${JOB_CONTAINER}"
 
 if [ "${CONTAINER_BUILD}" = "True" ] ; then
        "${OCI_RUNTIME}" build \

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.