Skip to content

Modify parsing of tags #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JCGoran wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Modify parsing of tags #43

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
be8b920
Modify parsing of tags (fixes #41)
JCGoran Mar 11, 2021
ed5e647
Fix for default tag
JCGoran Mar 15, 2021
a6ba79b
Fix for error message on tags
JCGoran Mar 15, 2021
53ce003
Improved fix for validating the tags
JCGoran Mar 15, 2021
9308311
Increase verbosity in case of an invalid tag
JCGoran Mar 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 45 additions & 12 deletions xfce-test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ RUN_AS=
LOG=${LOG:-/dev/stdout}
PARALLEL_BUILDS=${PARALLEL_BUILDS:-0}
TRAVIS=${TRAVIS:-FALSE}
TAG=${TAG:-latest}

is_my_git() {
if git remote -v 2>/dev/null|grep "schuellerf/xfce-test" &>/dev/null; then
Expand Down Expand Up @@ -84,6 +85,38 @@ get-free-display(){
done
}

# checks that the passed tag ($1) is available on Dockerhub or locally ($2)
validate_tag(){
TAG="$1"

# check against whatever $2 is
case "$2" in
"Dockerhub")
tags="$(get_tags)"
location="on Dockerhub"
;;
"local")
tags="$(get_local_tags)"
location="locally"
;;
esac

for t in ${tags}; do
if [ "${t}" = "${TAG}" ]; then
return 0
fi
done

# the specified tag doesn't exist on Dockerhub or locally,
# so we list the available ones and return non-zero exit code
printf "The tag '%s' was not found %s\n" "${TAG}" "${location}"
printf -- "---\n"
printf "The following tags are available %s:\n" "${location}"
printf "%s\n" "${tags}"
return 1
}


# use this X display number for the tests
export DISPLAY_NUM=$(get-free-display)

Expand Down Expand Up @@ -194,17 +227,6 @@ MODES_FOR_CASE=$(IFS=$'|'; echo "${WORK_MODES[*]}")
shopt -s extglob
MODES_FOR_CASE="+($MODES_FOR_CASE)"

if [ -z $TAG ]; then
if is_my_git; then
TAG=$(git rev-parse --abbrev-ref HEAD 2>/dev/null|tr '/' '_')
if [[ $TAG == "last_tag" ]]; then
TAG=latest
fi
else
TAG=latest
fi
fi

if [ $# -ge 1 ]; then
case $1 in
"install")
Expand All @@ -227,7 +249,10 @@ if [ $# -ge 1 ]; then
;;
"pull")
if [ -n "$2" ]; then
TAG=$2
TAG="$2"
if ! validate_tag "${TAG}" "Dockerhub"; then
exit 2
fi
fi
mode=$1
;;
Expand Down Expand Up @@ -439,6 +464,14 @@ case $mode in
;;
esac

# check whether the tag the user passed is actually valid
if ! validate_tag "${TAG}" "Dockerhub" && \
! ( printf "Attempting to find the tag '%s' locally...\n" "${TAG}" && \
validate_tag "${TAG}" "local" ); then
printf "Unable to find the tag '%s' either on Dockerhub or locally, exiting...\n" "${TAG}"
exit 1
fi

echo "You are working with the container: $TAG"

# This starts the container for manual or semi automated tests
Expand Down