File tree Expand file tree Collapse file tree 4 files changed +7
-7
lines changed Expand file tree Collapse file tree 4 files changed +7
-7
lines changed Original file line number Diff line number Diff line change @@ -28,11 +28,11 @@ SCRIPT_DIR=`realpath $(dirname "${BASH_SOURCE[0]}")`
2828
2929mkdir -p $3
3030cd $3
31- az acr login --name $1
31+ az acr login --name $1 --output none
3232git clone https://github.com/Azure/azure-functions-docker
33- docker build -f ./azure-functions-docker/host/2.0/stretch/amd64/base .Dockerfile ./azure-functions-docker/host/2.0/stretch/amd64 -t azure-functions-base -dev
33+ docker build -f ./azure-functions-docker/host/2.0/stretch/amd64/python-deps .Dockerfile ./azure-functions-docker/host/2.0/stretch/amd64 -t azure-functions-python-deps -dev
3434# The directory to build from needs to be the amd64, because the Dockerfile copies resources
35- docker build --build-arg BASE_IMAGE =azure-functions-base- dev -f ./azure-functions-docker/host/2.0/stretch/amd64/python.Dockerfile -t azure-functions-python-dev ./azure-functions-docker/host/2.0/stretch/amd64
35+ docker build --build-arg BASE_PYTHON_IMAGE =azure-functions-python-deps- dev -f ./azure-functions-docker/host/2.0/stretch/amd64/python-buildenv .Dockerfile -t azure-functions-python-dev ./azure-functions-docker/host/2.0/stretch/amd64
3636docker build --build-arg BASE_IMAGE=azure-functions-python-dev -f ${SCRIPT_DIR} /dev.Dockerfile ${SCRIPT_DIR} /../../../.. -t azure-functions-python-dev-updated
3737docker tag azure-functions-python-dev-updated $1 .azurecr.io/$2
3838docker push $1 .azurecr.io/$2
Original file line number Diff line number Diff line change @@ -15,7 +15,7 @@ YELLOW='\033[1;33m'
1515# This may be needed if docker image is restarted
1616# Better to simply login again at every invoke
1717echo " Ensuring login to Azure ACR"
18- az acr login --name ${ACR_NAME} > /dev/null
18+ az acr login --name ${ACR_NAME} --output none
1919
2020echo -e " Starting Parallel execution in background"
2121
Original file line number Diff line number Diff line change @@ -15,7 +15,7 @@ YELLOW='\033[1;33m'
1515# This may be needed if docker image is restarted
1616# Better to simply login again at every invoke
1717echo " Ensuring login to Azure ACR"
18- az acr login --name ${ACR_NAME} > /dev/null
18+ az acr login --name ${ACR_NAME} --output none
1919
2020echo -e " Starting Serial Execution..."
2121echo " This will take a while"
@@ -40,7 +40,7 @@ run_test ${BASE_DIR}/prod_func_prod_docker/new_no_bundler.sh ${TESTS_LOGS}/pfpdn
4040run_test ${BASE_DIR} /prod_func_prod_docker/new_packapp.sh ${TESTS_LOGS} /pfpdnpa.log ${TESTS_TIMEOUT} ${WORKING_DIR} /pfpdnpa.result
4141
4242echo " Ensuring login to Azure ACR (again because login has been flaky)"
43- az acr login --name ${ACR_NAME} > /dev/null
43+ az acr login --name ${ACR_NAME} --output none
4444run_test ${BASE_DIR} /prod_func_dev_docker/customer_build_native_deps.sh ${TESTS_LOGS} /pfddcbnd.log ${TESTS_TIMEOUT} ${WORKING_DIR} /pfddcbnd.result
4545run_test ${BASE_DIR} /prod_func_dev_docker/customer_no_bundler.sh ${TESTS_LOGS} /pfddcnb.log ${TESTS_TIMEOUT} ${WORKING_DIR} /pfddcnb.result
4646run_test ${BASE_DIR} /prod_func_dev_docker/new_build_native_deps.sh ${TESTS_LOGS} /pfddnbnd.log ${TESTS_TIMEOUT} ${WORKING_DIR} /pfddnbnd.result
Original file line number Diff line number Diff line change 55source " $( dirname " ${BASH_SOURCE[0]} " ) /helpers/get_config_variables.sh"
66
77# Login to the Service Principal Azure Account
8- az login --service-principal -u ${SP_USER_NAME} -p ${SP_PASSWORD} --tenant ${SP_TENANT}
8+ az login --service-principal -u ${SP_USER_NAME} -p ${SP_PASSWORD} --tenant ${SP_TENANT} --output none
99
1010# Update the ACR Docker Image with the dev branch of Docker image and python worker
1111chmod a+x $( dirname " ${BASH_SOURCE[0]} " ) /../dev_docker_setup/setup.sh
You can’t perform that action at this time.
0 commit comments