updated script for new names

Signed-off-by: Adam Hill <adam@diginc.us>
This commit is contained in:
Adam Hill 2018-08-04 14:24:44 -05:00
parent 80d5b9dbc1
commit 65ecba6705
No known key found for this signature in database
GPG Key ID: 2193804FCA429855
1 changed files with 18 additions and 19 deletions

View File

@ -17,38 +17,37 @@ branch="$(parse_git_branch)"
version="${version:-unset}"
dry="${dry}"
if [[ -n "$dry" ]] ; then dry='echo ' ; fi
if [[ -n "$dry" ]]; then dry='echo '; fi
if [[ "$version" == 'unset' ]]; then
version="$branch"
if [[ "$branch" == "master" ]]; then
echo "Version number var is unset and master branch needs a version...pass in \$version variable!"
exit 1
else if [[ "$branch" = "release/"* ]]
echo "Version number is being taken from this release branch"
elif [[ "$branch" = "release/"* ]]; then
version="$(echo $branch | grep -Po 'v[\d.-]')"
echo "Version number is being taken from this release branch $version"
else
version="$branch"
remoteimg="${namespace}/${localimg}-dev"
echo "Using the branch ($branch) for deployed image version since not passed in"
fi
echo "Using the branch ($branch) for deployed image version since not passed in"
fi
echo "# DEPLOYING:"
echo "version: $version"
echo "branch: $branch"
[[ -n "$dry" ]] && echo "DRY RUN: $dry"
echo "Example tagging: docker tag $localimg:$tag $remoteimg:${version}_${tag}"
echo
echo "Example tagging: docker tag $localimg:$tag $remoteimg:${version}_amd64"
$dry ./Dockerfile.py
if [[ "$branch" == "master" ]] || [[ "$branch" = "release/"* ]] ; then
# ARMv6/armel doesn't have a FTL binary for v4.0 pi-hole
# for tag in debian_armhf debian_aarch64 debian_armel; do
for tag in amd64 armhf aarch64; do
# Verison specific tags for ongoing history
$dry docker tag $localimg:$tag $remoteimg:${version}_${tag}
$dry docker push pihole/pihole-multiarch:${version}_${tag}
# Floating latest tags
$dry docker tag pi-hole-multiarch:$tag pihole/pihole-multiarch:${tag}
$dry docker push pihole/pihole-multiarch:${tag}
done
fi
# ARMv6/armel doesn't have a FTL binary for v4.0 pi-hole
# for tag in debian_armhf debian_aarch64 debian_armel; do
for tag in amd64 armhf aarch64; do
# Verison specific tags for ongoing history
$dry docker tag $localimg:$tag $remoteimg:${version}_${tag}
$dry docker push pihole/pihole-multiarch:${version}_${tag}
# Floating latest tags
$dry docker tag pi-hole-multiarch:$tag pihole/pihole-multiarch:${tag}
$dry docker push pihole/pihole-multiarch:${tag}
done