From 3b35f8279eed89d3fb41cd9972ef150a5af64135 Mon Sep 17 00:00:00 2001 From: Dmitry Kosolapov home Date: Thu, 25 May 2023 20:51:12 +0700 Subject: [PATCH 1/7] test node:16-alpine3.16 --- .drone.yml | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/.drone.yml b/.drone.yml index 26b31dc5..a12022c6 100644 --- a/.drone.yml +++ b/.drone.yml @@ -220,9 +220,28 @@ trigger: - refs/heads/develop steps: - - name: deploy script - image: node:16-alpine + - name: npm-install + image: node:16-alpine3.16 + environment: + REACT_APP_STRIPE_PK: + from_secret: REACT_APP_STRIPE_PK + commands: + - apk add --no-cache make + - npm install --legacy-peer-deps + - name: make-develop + image: node:16-alpine3.16 + environment: + REACT_APP_STRIPE_PK: + from_secret: REACT_APP_STRIPE_PK + commands: + - apk add --no-cache make + - make preprod + depends_on: + - npm-install + + - name: deploy-develop + image: amazon/aws-cli:latest environment: AWS_ACCESS_KEY_ID: from_secret: AWS_ACCESS_KEY_ID @@ -230,18 +249,14 @@ steps: from_secret: AWS_SECRET_ACCESS_KEY AWS_DEFAULT_REGION: from_secret: AWS_DEFAULT_REGION - REACT_APP_STRIPE_PK: - from_secret: REACT_APP_STRIPE - SSH_KEY_AUTH: - from_secret: SSH_KEY_AUTH - + AWS_MAX_ATTEMPTS: 10 commands: - - apk add --no-cache aws-cli bash git openssh-client make rsync - - npm install --legacy-peer-deps - - make preprod - aws s3 sync build s3://instat-frontend-test --delete - aws cloudfront create-invalidation --distribution-id E2ZD1DVVFA1ACC --paths "/*" + depends_on: + - make-develop + --- kind: pipeline type: docker -- 2.30.2 From 71844952569116aa0d2b299261695f791a57d8c6 Mon Sep 17 00:00:00 2001 From: Dmitry Kosolapov home Date: Thu, 25 May 2023 20:52:09 +0700 Subject: [PATCH 2/7] add fix_develop --- .drone.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.yml b/.drone.yml index a12022c6..9e935a8c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -218,6 +218,7 @@ platform: trigger: ref: - refs/heads/develop + - refs/heads/fix_develop steps: - name: npm-install -- 2.30.2 From d812ede5914289c6c6fdf4f8241d0cb5b241627a Mon Sep 17 00:00:00 2001 From: Dmitry Kosolapov home Date: Thu, 25 May 2023 20:56:39 +0700 Subject: [PATCH 3/7] add fix_develop --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 9e935a8c..41f2d594 100644 --- a/.drone.yml +++ b/.drone.yml @@ -222,7 +222,7 @@ trigger: steps: - name: npm-install - image: node:16-alpine3.16 + image: node:17-alpine environment: REACT_APP_STRIPE_PK: from_secret: REACT_APP_STRIPE_PK @@ -231,7 +231,7 @@ steps: - npm install --legacy-peer-deps - name: make-develop - image: node:16-alpine3.16 + image: node:17-alpine environment: REACT_APP_STRIPE_PK: from_secret: REACT_APP_STRIPE_PK -- 2.30.2 From 71f7e26db8ffeecb49217b52defac07700f5465f Mon Sep 17 00:00:00 2001 From: Dmitry Kosolapov home Date: Thu, 25 May 2023 21:00:12 +0700 Subject: [PATCH 4/7] add fix_develop --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 41f2d594..03b6721d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -222,7 +222,7 @@ trigger: steps: - name: npm-install - image: node:17-alpine + image: node:18-alpine environment: REACT_APP_STRIPE_PK: from_secret: REACT_APP_STRIPE_PK @@ -231,7 +231,7 @@ steps: - npm install --legacy-peer-deps - name: make-develop - image: node:17-alpine + image: node:18-alpine environment: REACT_APP_STRIPE_PK: from_secret: REACT_APP_STRIPE_PK -- 2.30.2 From d51c1380ec68d1b51b928cfb26c99a0aabbe0c53 Mon Sep 17 00:00:00 2001 From: Dmitry Kosolapov home Date: Thu, 25 May 2023 21:05:03 +0700 Subject: [PATCH 5/7] add fix_develop --- .drone.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index 03b6721d..ed351101 100644 --- a/.drone.yml +++ b/.drone.yml @@ -222,21 +222,20 @@ trigger: steps: - name: npm-install - image: node:18-alpine + image: node:16 environment: REACT_APP_STRIPE_PK: from_secret: REACT_APP_STRIPE_PK commands: - - apk add --no-cache make - npm install --legacy-peer-deps - name: make-develop - image: node:18-alpine + image: node:16 environment: REACT_APP_STRIPE_PK: from_secret: REACT_APP_STRIPE_PK commands: - - apk add --no-cache make + - apt install make - make preprod depends_on: - npm-install -- 2.30.2 From 960564addcc8dbeec2bab596477b895641a1a9e8 Mon Sep 17 00:00:00 2001 From: Dmitry Kosolapov home Date: Thu, 25 May 2023 21:16:17 +0700 Subject: [PATCH 6/7] add fix_develop --- .drone.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index ed351101..9b30c024 100644 --- a/.drone.yml +++ b/.drone.yml @@ -222,20 +222,22 @@ trigger: steps: - name: npm-install - image: node:16 + image: node:16-alpine3.16 environment: REACT_APP_STRIPE_PK: from_secret: REACT_APP_STRIPE_PK commands: + - npm --version + - node --version - npm install --legacy-peer-deps - name: make-develop - image: node:16 + image: node:16-alpine3.16 environment: REACT_APP_STRIPE_PK: from_secret: REACT_APP_STRIPE_PK commands: - - apt install make + - apk add --no-cache make - make preprod depends_on: - npm-install -- 2.30.2 From 2043ce19cdf724cc4e44de51581f83d226515d77 Mon Sep 17 00:00:00 2001 From: Dmitry Kosolapov home Date: Tue, 13 Jun 2023 18:57:02 +0700 Subject: [PATCH 7/7] fix yml --- .drone.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 9b30c024..ddb05d20 100644 --- a/.drone.yml +++ b/.drone.yml @@ -227,8 +227,6 @@ steps: REACT_APP_STRIPE_PK: from_secret: REACT_APP_STRIPE_PK commands: - - npm --version - - node --version - npm install --legacy-peer-deps - name: make-develop -- 2.30.2