Clean up run-tests syntax

This commit is contained in:
w0rp 2023-02-13 04:24:54 +00:00
parent 9c45358aab
commit ab7757b532
No known key found for this signature in database
GPG Key ID: 0FC1ECAA8C81CD83
1 changed files with 4 additions and 6 deletions

View File

@ -166,24 +166,22 @@ download_image() {
docker pull "${image}:${image_tag}" &> /dev/null docker pull "${image}:${image_tag}" &> /dev/null
} }
if [ "$has_image" -eq 0 ] && ! download_image if [ "$has_image" -eq 0 ] && ! download_image; then
then
echo "Building run image ${image}:${image_tag}" echo "Building run image ${image}:${image_tag}"
build_args=( --build-arg GIT_VERSION="$git_version" ) build_args=( --build-arg GIT_VERSION="$git_version" )
if [[ $arch != x86_64 ]]; then if [[ $arch != x86_64 ]]; then
echo "Building testbed/vim:24 for $arch" echo "Building testbed/vim:24 for $arch"
testbed_vim_ref=902917c4caa50db2f2e80009b839605602f9f014 testbed_vim_ref=902917c4caa50db2f2e80009b839605602f9f014
docker build -t "testbed/vim:$testbed_vim_ref" "https://github.com/Vimjas/vim-testbed.git#$testbed_vim_ref" docker build -t "testbed/vim:$testbed_vim_ref" "https://github.com/Vimjas/vim-testbed.git#$testbed_vim_ref"
build_args+=( --build-arg TESTBED_VIM_VERSION="$testbed_vim_ref" ) build_args+=( --build-arg TESTBED_VIM_VERSION="$testbed_vim_ref" )
fi fi
docker build "${build_args[@]}" -t "${image}:${image_tag}" . docker build "${build_args[@]}" -t "${image}:${image_tag}" .
docker tag "${image}:${image_tag}" "${image}:latest" docker tag "${image}:${image_tag}" "${image}:latest"
if [[ -z "${DOCKER_HUB_USER:-}" || -z "${DOCKER_HUB_PASS:-}" ]] if [[ -z "${DOCKER_HUB_USER:-}" || -z "${DOCKER_HUB_PASS:-}" ]]; then
then
echo "Docker Hub credentials not set, skip push" echo "Docker Hub credentials not set, skip push"
else else
echo "Push ${image}:${image_tag} to Docker Hub" echo "Push ${image}:${image_tag} to Docker Hub"