From 8a96eea9f3bb32550bc90a2b41f12fecc6fda7fc Mon Sep 17 00:00:00 2001 From: Min RK Date: Fri, 2 Mar 2018 16:36:42 +0100 Subject: [PATCH] add CONFIG env back to run_docker_build missed in rebase of #337 --- conda_smithy/templates/run_docker_build.tmpl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/conda_smithy/templates/run_docker_build.tmpl b/conda_smithy/templates/run_docker_build.tmpl index 2f9938be7..bf1a3f0cc 100644 --- a/conda_smithy/templates/run_docker_build.tmpl +++ b/conda_smithy/templates/run_docker_build.tmpl @@ -67,7 +67,7 @@ touch /home/conda/feedstock_root/build_artifacts/conda-forge-build-done EOF set +x -echo "BINSTAR_TOKEN=${BINSTAR_TOKEN}" > "${FEEDSTOCK_ROOT}/env" +echo "BINSTAR_TOKEN=${BINSTAR_TOKEN}" > "${FEEDSTOCK_ROOT}/.circleci/env" set -x # Create and run the container in two commands, @@ -76,7 +76,8 @@ set -x CONTAINER=$(docker create -t \ -v "${RECIPE_ROOT}":/home/conda/recipe_root \ -v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root \ - --env-file ${FEEDSTOCK_ROOT}/env \ + --env-file ${FEEDSTOCK_ROOT}.circleci/env \ + -e CONFIG="${CONFIG}" \ -e HOST_USER_ID="${HOST_USER_ID}" \ {{ docker.image }} \ {{ docker.command }} \