From 07d5e784790e33a5a231e265195105758da368f8 Mon Sep 17 00:00:00 2001 From: anthony Date: Mon, 3 Jan 2022 11:05:56 +0100 Subject: [PATCH 1/5] :construction: Configure for dev environment --- .circleci/config.yml | 66 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 58 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2f030ff..78f41a8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -12,6 +12,10 @@ globals: image: &dockerhub-image devops-tpfinal-front backends: prod: &prod-backend-url https://tpfinal-devops-back.herokuapp.com + dev: &dev-backend-url https://tpfinal-devops-back-dev.herokuapp.com + netlify. + prod-siteid: &prod-siteid 4704e2ec-1222-4a40-be89-4a676233b5c9 + develop-siteid: &dev-siteid d60f86f2-dc79-4d4d-b661-00f60e73e7a9 # --- Commands --- # @@ -68,7 +72,8 @@ jobs: docker-build: <<: *shared-config parameters: - backendurl: + tags: + default: "" type: string environment: DOCKER_HUB_PWD: *dockerhub-password @@ -80,16 +85,17 @@ jobs: version: 20.10.7 - run: name: Build docker image - command: | - docker build -t app --build-arg backend_url=<> . + command: docker build -t app . - deploy: name: Publish image to Docker Hub command: | echo $DOCKERHUB_PASSWORD | docker login -u $DOCKER_HUB_USER_ID --password-stdin - docker tag app $DOCKER_HUB_USER_ID/$DOCKER_HUB_IMAGE:$CIRCLE_BUILD_NUM - docker tag app $DOCKER_HUB_USER_ID/$DOCKER_HUB_IMAGE:latest - docker push $DOCKER_HUB_USER_ID/$DOCKER_HUB_IMAGE:$CIRCLE_BUILD_NUM - docker push $DOCKER_HUB_USER_ID/$DOCKER_HUB_IMAGE:latest + + for tag in <> + do + docker tag app $DOCKER_HUB_USER_ID/$DOCKER_HUB_IMAGE:$tag + docker push $DOCKER_HUB_USER_ID/$DOCKER_HUB_IMAGE:$tag + done build-netlify: <<: *shared-config @@ -115,7 +121,13 @@ jobs: deploy-netlify: <<: *shared-config + parameters: + siteurl: + type: string working_directory: ~/todoapp + environment: + NETLIFY_SITE_ID: <> + steps: - attach_workspace: at: /tmp @@ -143,6 +155,7 @@ workflows: - build - build-netlify: + name: build-netlify-prod backendurl: *prod-backend-url requires: - test @@ -152,15 +165,40 @@ workflows: only: - main + - build-netlify: + name: build-netlify-dev + backendurl: *dev-backend-url + requires: + - test + - lint +# filters: +# branches: +# only: +# - develop + - deploy-netlify: + name: deploy-netlify-prod + siteid: *prod-siteid requires: - - build-netlify + - build-netlify-prod filters: branches: only: - main + - deploy-netlify: + name: deploy-netlify-dev + siteid: *dev-siteid + requires: + - build-netlify-dev +# filters: +# branches: +# only: +# - develop + - docker-build: + name: docker-build-prod + tags: "latest $CIRCLE_BUILD_NUM" backendurl: *prod-backend-url requires: - test @@ -169,3 +207,15 @@ workflows: branches: only: - main + + - docker-build: + name: docker-build-dev + tags: "dev $CIRCLE_BUILD_NUM-dev" + backendurl: *prod-backend-url + requires: + - test + - lint +# filters: +# branches: +# only: +# - develop From 9fbe102b789ece9c906ee0a9a8c06ebdfee28f56 Mon Sep 17 00:00:00 2001 From: anthony Date: Mon, 3 Jan 2022 11:06:43 +0100 Subject: [PATCH 2/5] :pencil2: Fix typo --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 78f41a8..361147d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -13,9 +13,9 @@ globals: backends: prod: &prod-backend-url https://tpfinal-devops-back.herokuapp.com dev: &dev-backend-url https://tpfinal-devops-back-dev.herokuapp.com - netlify. + netlify: prod-siteid: &prod-siteid 4704e2ec-1222-4a40-be89-4a676233b5c9 - develop-siteid: &dev-siteid d60f86f2-dc79-4d4d-b661-00f60e73e7a9 + develop-siteid: &dev-siteid d60f86f2-dc79-4d4d-b661-00f60e73e7a9 # --- Commands --- # From e821284fe59413520d1d981b94eeba950c368da1 Mon Sep 17 00:00:00 2001 From: anthony Date: Mon, 3 Jan 2022 11:07:46 +0100 Subject: [PATCH 3/5] :pencil2: Rename site id parameter --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 361147d..351b2e6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -122,11 +122,11 @@ jobs: deploy-netlify: <<: *shared-config parameters: - siteurl: + siteid: type: string working_directory: ~/todoapp environment: - NETLIFY_SITE_ID: <> + NETLIFY_SITE_ID: <> steps: - attach_workspace: From c67f3e5ea32c91f6529b5696d41537e681b75531 Mon Sep 17 00:00:00 2001 From: anthony Date: Mon, 3 Jan 2022 11:10:49 +0100 Subject: [PATCH 4/5] :green_heart: Add backend url parameter to build docker job --- .circleci/config.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 351b2e6..7d6b6e9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -75,6 +75,8 @@ jobs: tags: default: "" type: string + backendurl: + type: string environment: DOCKER_HUB_PWD: *dockerhub-password DOCKER_HUB_USER_ID: *dockerhub-user-id @@ -85,7 +87,7 @@ jobs: version: 20.10.7 - run: name: Build docker image - command: docker build -t app . + command: docker build -t app --build-arg backend_url=<> . - deploy: name: Publish image to Docker Hub command: | @@ -211,7 +213,7 @@ workflows: - docker-build: name: docker-build-dev tags: "dev $CIRCLE_BUILD_NUM-dev" - backendurl: *prod-backend-url + backendurl: *dev-backend-url requires: - test - lint From 582f3e27a1fd8d7a7e9093e915b8d68ce0967010 Mon Sep 17 00:00:00 2001 From: anthony Date: Mon, 3 Jan 2022 11:14:57 +0100 Subject: [PATCH 5/5] :construction_worker: Add branch restriction fro develop branch --- .circleci/config.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7d6b6e9..a9c3bf0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -173,10 +173,10 @@ workflows: requires: - test - lint -# filters: -# branches: -# only: -# - develop + filters: + branches: + only: + - develop - deploy-netlify: name: deploy-netlify-prod @@ -193,10 +193,10 @@ workflows: siteid: *dev-siteid requires: - build-netlify-dev -# filters: -# branches: -# only: -# - develop + filters: + branches: + only: + - develop - docker-build: name: docker-build-prod @@ -217,7 +217,7 @@ workflows: requires: - test - lint -# filters: -# branches: -# only: -# - develop + filters: + branches: + only: + - develop