Skip to content

Commit

Permalink
Fix order of operations in docker script
Browse files Browse the repository at this point in the history
  • Loading branch information
lox committed Apr 30, 2018
1 parent a068ad0 commit 1fd565c
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions .buildkite/steps/build-docker-images.sh
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,14 @@ echo '--- Downloading :linux: binaries'
buildkite-agent artifact download "pkg/buildkite-agent-linux-amd64" .

variant="$1"
if [[ ! "$variant" =~ ^(alpine|ubuntu)$ ]] ; then
echo "Unknown docker variant $variant"
exit 1
fi

echo "--- Getting docker image tag for $variant from build meta data"
image_tag=$(buildkite-agent meta-data get "agent-docker-image-$variant")
echo "Docker Image Tag for $variant: $image_tag"

case $variant in
alpine)
Expand All @@ -69,9 +77,5 @@ ubuntu)
;;
esac

echo "--- Getting docker image tag for $variant from build meta data"
image_tag=$(buildkite-agent meta-data get "agent-docker-image-$variant")
echo "Docker Image Tag for $variant: $image_tag"

test_docker_image "$image_tag"
push_docker_image "$image_tag"

0 comments on commit 1fd565c

Please sign in to comment.