diff options
| author | Devan Carpenter <devan@taler.net> | 2024-01-17 08:06:07 -0500 |
|---|---|---|
| committer | Devan Carpenter <devan@taler.net> | 2024-01-17 08:06:07 -0500 |
| commit | a5366e168023535867c67fa81aeff15addf184e6 (patch) | |
| tree | 633e6f1e157f85e1fb3b5037317104bf00499bc6 | |
| parent | 2dd0aa1b12f479d82097c946a9cda03ad1ce0286 (diff) | |
| download | merchant-a5366e168023535867c67fa81aeff15addf184e6.tar.gz merchant-a5366e168023535867c67fa81aeff15addf184e6.tar.bz2 merchant-a5366e168023535867c67fa81aeff15addf184e6.zip | |
ci: drop docker support from local ci script
| -rwxr-xr-x | contrib/ci/ci.sh | 10 |
1 files 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 \ |