Skip to content

Commit

Permalink
Merge pull request #454 from minrk/docker-canary
Browse files Browse the repository at this point in the history
verify that docker script reached its end
  • Loading branch information
jakirkham committed Feb 19, 2017
2 parents ed97b46 + f63e30f commit 4ee2b97
Showing 1 changed file with 9 additions and 1 deletion.
10 changes: 9 additions & 1 deletion conda_smithy/templates/run_docker_build.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,14 @@ show_channel_urls: true
CONDARC
)

rm -f "$FEEDSTOCK_ROOT/build_artefacts/conda-forge-build-done"

cat << EOF | docker run -i \
-v "${RECIPE_ROOT}":/recipe_root \
-v "${FEEDSTOCK_ROOT}":/feedstock_root \
-a stdin -a stdout -a stderr \
{{ docker.image }} \
{{ docker.command }} || exit $?
{{ docker.command }} || exit 1
export BINSTAR_TOKEN=${BINSTAR_TOKEN}
export PYTHONUNBUFFERED=1
Expand All @@ -50,5 +52,11 @@ conda build /recipe_root --quiet || exit 1
{%- endfor -%}
{%- endblock -%}
touch /feedstock_root/build_artefacts/conda-forge-build-done
EOF

# double-check that the build got to the end
# see https://github.com/conda-forge/conda-smithy/pull/337
# for a possible fix
set -x
test -f "$FEEDSTOCK_ROOT/build_artefacts/conda-forge-build-done" || exit 1

0 comments on commit 4ee2b97

Please sign in to comment.