travis: add generic install.sh to find image-appropriate script

Makes it easier to add images with weird characters in them, e.g.
"opensuse/tumbleweed:latest" would end up giving the wrong path with the
old config.

Signed-off-by: Steven Noonan <steven@valvesoftware.com>
This commit is contained in:
Steven Noonan
2020-09-03 18:04:41 -07:00
parent dde5e7a48d
commit 2afd8efa9d
2 changed files with 23 additions and 1 deletions
+1 -1
View File
@@ -43,7 +43,7 @@ before_install:
- docker exec -e TRAVIS_BUILD=1 -e IMAGE=$IMAGE -e IMAGE_TAG=$IMAGE_TAG -t $CONTAINER_NAME sh .travis/preinstall.sh
install:
- docker exec -e TRAVIS_BUILD=1 -e IMAGE=$IMAGE -e IMAGE_TAG=$IMAGE_TAG -t $CONTAINER_NAME bash .travis/install-$IMAGE.sh
- docker exec -e TRAVIS_BUILD=1 -e IMAGE=$IMAGE -e IMAGE_TAG=$IMAGE_TAG -t $CONTAINER_NAME bash .travis/install.sh
- docker exec -e TRAVIS_BUILD=1 -e IMAGE=$IMAGE -e IMAGE_TAG=$IMAGE_TAG -t $CONTAINER_NAME bash .travis/install-post.sh
script:
+22
View File
@@ -0,0 +1,22 @@
#!/bin/bash
INSTALL_SCRIPT_CANDIDATES=(
"$PWD/.travis/install-${IMAGE//\//-}.sh"
"$PWD/.travis/install-${IMAGE%/*}.sh"
)
for INSTALL_SCRIPT in "${INSTALL_SCRIPT_CANDIDATES[@]}"; do
if [[ -f "${INSTALL_SCRIPT}" ]]; then
bash "${INSTALL_SCRIPT}"
exit $?
fi
done
echo "Could not find install script in any of these paths:"
for INSTALL_SCRIPT in "${INSTALL_SCRIPT_CANDIDATES[@]}"; do
echo " ${INSTALL_SCRIPT}"
done
echo ""
echo "Don't know how to install packages for ${IMAGE}!"
echo ""
exit 1