From a15352f574ddf92e7ce0b87245e6a94716c9f976 Mon Sep 17 00:00:00 2001 From: Chuangxin Lin Date: Tue, 29 Dec 2020 00:11:03 -0500 Subject: [PATCH 1/4] prepared to realease to heroku with docker --- .circleci/config.yml | 10 +++++----- scripts/fetch_kaggle_dataset.sh | 4 +++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 55a978023..033c0ac07 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -119,7 +119,7 @@ jobs: steps: - checkout - setup_remote_docker: - docker_layer_caching: true + docker_layer_caching: false - run: docker login --username=$HEROKU_EMAIL --password=$HEROKU_API_KEY registry.heroku.com - run: name: Setup Heroku CLI @@ -160,7 +160,7 @@ workflows: - section_11_build_and_push_to_heroku_docker: requires: - train_and_upload_regression_model - filters: - branches: - only: - - master + # filters: + # branches: + # only: + # - master diff --git a/scripts/fetch_kaggle_dataset.sh b/scripts/fetch_kaggle_dataset.sh index 455b9c970..c484fa2ea 100644 --- a/scripts/fetch_kaggle_dataset.sh +++ b/scripts/fetch_kaggle_dataset.sh @@ -1,3 +1,5 @@ #!/usr/bin/env bash -kaggle competitions download -c house-prices-advanced-regression-techniques -p packages/regression_model/regression_model/datasets/ \ No newline at end of file +kaggle competitions download -c house-prices-advanced-regression-techniques -p packages/regression_model/regression_model/datasets/ +unzip packages/regression_model/regression_model/datasets/house-prices-advanced-regression-techniques.zip \ + -d packages/regression_model/regression_model/datasets/ \ No newline at end of file From 42784d6b679451e96611b6406fd6a8c037f8cd15 Mon Sep 17 00:00:00 2001 From: Chuangxin Lin Date: Tue, 29 Dec 2020 00:16:13 -0500 Subject: [PATCH 2/4] removed requirement for build_and_push_to_heroku_docker so we can run it --- .circleci/config.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 033c0ac07..d66a76067 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -157,9 +157,10 @@ workflows: # branches: # only: # - master - - section_11_build_and_push_to_heroku_docker: - requires: - - train_and_upload_regression_model + - section_11_build_and_push_to_heroku_docker + # - section_11_build_and_push_to_heroku_docker: + # requires: + # - train_and_upload_regression_model # filters: # branches: # only: From e8b8ea7283b58003604ccad7aca43c7a16c23bf9 Mon Sep 17 00:00:00 2001 From: Chuangxin Lin Date: Tue, 29 Dec 2020 00:28:44 -0500 Subject: [PATCH 3/4] changed appname in makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 54dd9bed6..42ec60498 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -NAME=udemy-ml-api +NAME=udemy-ml-lcx-api COMMIT_ID=$(shell git rev-parse HEAD) From 12ed3874802b4b6f584440954dbd261437d70de2 Mon Sep 17 00:00:00 2001 From: Chuangxin Lin Date: Tue, 29 Dec 2020 00:41:45 -0500 Subject: [PATCH 4/4] changed commit hash to latest to avoid the 404 issue --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 42ec60498..a545d7ef6 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ COMMIT_ID=$(shell git rev-parse HEAD) build-ml-api-heroku: - docker build --build-arg PIP_EXTRA_INDEX_URL=${PIP_EXTRA_INDEX_URL} -t registry.heroku.com/$(NAME)/web:$(COMMIT_ID) . + docker build --build-arg PIP_EXTRA_INDEX_URL=${PIP_EXTRA_INDEX_URL} -t registry.heroku.com/$(NAME)/web:latest . push-ml-api-heroku: - docker push registry.heroku.com/${HEROKU_APP_NAME}/web:$(COMMIT_ID) + docker push registry.heroku.com/${HEROKU_APP_NAME}/web:latest