diff options
Diffstat (limited to 'contrib/ci/ci.sh')
| -rwxr-xr-x | contrib/ci/ci.sh | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/contrib/ci/ci.sh b/contrib/ci/ci.sh index f0be84242..f454a6e3b 100755 --- a/contrib/ci/ci.sh +++ b/contrib/ci/ci.sh @@ -1,21 +1,28 @@ #!/bin/bash set -exvuo pipefail -# Use podman, fails if it isn't found in PATH +# 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 "localhost/${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") +CONTAINERFILE="contrib/ci/$JOB_ARCH.Containerfile" -echo "${JOB_CONTAINER}" +if ! [[ -f "$CONTAINERFILE" ]]; then + CONTAINERFILE="$(dirname "$CONTAINERFILE")/Containerfile" +fi; + +echo "Image name: ${JOB_CONTAINER} +Containerfile: ${CONTAINERFILE}" if [ "${CONTAINER_BUILD}" = "True" ] ; then "${OCI_RUNTIME}" build \ --arch "${JOB_ARCH}" \ -t "${JOB_CONTAINER}" \ - -f contrib/ci/Containerfile . + -f "$CONTAINERFILE" . fi "${OCI_RUNTIME}" run \ |