diff options
Diffstat (limited to 'contrib/ci/ci.sh')
| -rwxr-xr-x | contrib/ci/ci.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/contrib/ci/ci.sh b/contrib/ci/ci.sh index f454a6e3b..611977bd3 100755 --- a/contrib/ci/ci.sh +++ b/contrib/ci/ci.sh @@ -9,9 +9,12 @@ JOB_NAME="${1}" 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" +CONTAINERFILE="contrib/ci/jobs/${JOB_NAME}/Containerfile" if ! [[ -f "$CONTAINERFILE" ]]; then + CONTAINERFILE="contrib/ci/$JOB_ARCH.Containerfile" +fi; +if ! [[ -f "$CONTAINERFILE" ]]; then CONTAINERFILE="$(dirname "$CONTAINERFILE")/Containerfile" fi; |