(feat): entire deploy flow now in master and making use of environments for production deployments

.gitlab-ci.yml

@@ -8,6 +8,7 @@ stages:
  - test
  - prepare
  - review
+ - staging
  - deploy
 
 cache:
@@ -73,8 +74,7 @@ review:start:
  on_stop: review:stop
  except: 
  refs:
- - master #staging
- - production
+ - master
  - test/gitlab-ci
 
 review:stop:
@@ -92,70 +92,79 @@ review:stop:
  when: manual
  except: 
  refs:
- - master #staging
- - production
+ - master
  - test/gitlab-ci
 
-staging:
+staging:fpm:
  stage: deploy
  image: minds/helm-eks:latest
  script:
- - aws eks update-kubeconfig --name=sandbox
- - git clone --branch=sandbox-wip https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/minds/helm-charts.git
- - "helm upgrade \
-  --install \
-  --values=values-staging.yaml \
-  --set phpfpm.image.repository=$CI_REGISTRY_IMAGE/fpm \
-  --set phpfpm.image.tag=$CI_BUILD_REF \
-  --set runners.image.repository=$CI_REGISTRY_IMAGE/runners \
-  --set runners.image.tag=$CI_BUILD_REF \
-  --wait \
-  staging \
-  ./helm-charts/minds"
+ - IMAGE_LABEL="staging"
+ - $(aws ecr get-login --no-include-email --region us-east-1)
+ - docker login -u gitlab-ci-token -p ${CI_BUILD_TOKEN} ${CI_REGISTRY}
+ - docker pull $CI_REGISTRY_IMAGE/fpm:$CI_BUILD_REF
+ # Push to AWS registry
+ - docker tag $CI_REGISTRY_IMAGE/fpm:$CI_BUILD_REF $ECR_REPOSITORY_URL_FPM:$IMAGE_LABEL
+ - docker push $ECR_REPOSITORY_URL_FPM:$IMAGE_LABEL
+ # Push to Gitlab registry
+ - docker tag $CI_REGISTRY_IMAGE/fpm:$CI_BUILD_REF $CI_REGISTRY_IMAGE/fpm:$IMAGE_LABEL
+ - docker push $CI_REGISTRY_IMAGE/fpm:$IMAGE_LABEL
+ # Deploy to staging
+ - aws ecs update-service --service=$ECS_APP_STAGING_SERVICE --force-new-deployment --region us-east-1 --cluster=$ECS_CLUSTER
  environment:
  name: staging
- url: https://staging.minds.io/
+ url: https://www.minds.com/?staging=1
  only: 
  refs:
- - master #staging
- - test/staging
+ - master
+ - test/gitlab-ci
 
 canary:fpm:
  stage: deploy
  image: minds/ci:latest
  script:
+ - IMAGE_LABEL="canary"
  - $(aws ecr get-login --no-include-email --region us-east-1)
  - docker login -u gitlab-ci-token -p ${CI_BUILD_TOKEN} ${CI_REGISTRY}
  - docker pull $CI_REGISTRY_IMAGE/fpm:$CI_BUILD_REF
- # Push to production registry
- - docker tag $CI_REGISTRY_IMAGE/fpm:$CI_BUILD_REF $ECR_REPOSITORY_URL_FPM:canary
- - docker push $ECR_REPOSITORY_URL_FPM:canary
- # Push to gitlab register
- - docker tag $CI_REGISTRY_IMAGE/fpm:$CI_BUILD_REF $CI_REGISTRY_IMAGE/fpm:canary
- - docker push $CI_REGISTRY_IMAGE/fpm:canary
+ # Push to AWS registry
+ - docker tag $CI_REGISTRY_IMAGE/fpm:$CI_BUILD_REF $ECR_REPOSITORY_URL_FPM:$IMAGE_LABEL
+ - docker push $ECR_REPOSITORY_URL_FPM:$IMAGE_LABEL
+ # Push to Gitlab registry
+ - docker tag $CI_REGISTRY_IMAGE/fpm:$CI_BUILD_REF $CI_REGISTRY_IMAGE/fpm:$IMAGE_LABEL
+ - docker push $CI_REGISTRY_IMAGE/fpm:$IMAGE_LABEL
+ # Deploy to ECS
  - aws ecs update-service --service=$ECS_APP_CANARY_SERVICE --force-new-deployment --region us-east-1 --cluster=$ECS_CLUSTER
  only:
  refs:
- - production
+ - master
  - test/gitlab-ci
  environment:
  name: canary
- url: https://www.minds.com/ #requires canary cookie
+ url: https://www.minds.com/?canary=1 # requires canary cookie
+ when: manual
+ allow_failure: false # prevents auto deploy to full production
 
 production:fpm:
  stage: deploy
  image: minds/ci:latest
  script:
+ - IMAGE_LABEL="production"
  - $(aws ecr get-login --no-include-email --region us-east-1)
  - docker login -u gitlab-ci-token -p ${CI_BUILD_TOKEN} ${CI_REGISTRY}
  - docker pull $CI_REGISTRY_IMAGE/fpm:$CI_BUILD_REF
- # Push to production registry
- - docker tag $CI_REGISTRY_IMAGE/fpm:$CI_BUILD_REF $ECR_REPOSITORY_URL_FPM:latest
- - docker push $ECR_REPOSITORY_URL_FPM:production
- # Push to gitlab register
- - docker tag $CI_REGISTRY_IMAGE/fpm:$CI_BUILD_REF $CI_REGISTRY_IMAGE/fpm:latest
- - docker push $CI_REGISTRY_IMAGE/fpm:latest
+ # Push to AWS registry
+ - docker tag $CI_REGISTRY_IMAGE/fpm:$CI_BUILD_REF $ECR_REPOSITORY_URL_FPM:$IMAGE_LABEL
+ - docker push $ECR_REPOSITORY_URL_FPM:$IMAGE_LABEL
+ # Push to Gitlab registry
+ - docker tag $CI_REGISTRY_IMAGE/fpm:$CI_BUILD_REF $CI_REGISTRY_IMAGE/fpm:$IMAGE_LABEL
+ - docker push $CI_REGISTRY_IMAGE/fpm:$IMAGE_LABEL
+ # Delpoy to ECS
  - aws ecs update-service --service=$ECS_APP_PRODUCTION_SERVICE --force-new-deployment --region us-east-1 --cluster=$ECS_CLUSTER
+ only:
+ refs:
+ - master
+ - test/gitlab-ci
  environment:
  name: production
  url: https://www.minds.com/
@@ -178,7 +187,7 @@ production:runners:
  - aws ecs update-service --service=$ECS_RUNNERS_PRODUCTION_SERVICE --force-new-deployment --region us-east-1 --cluster=$ECS_CLUSTER
  only:
  refs:
- - production
+ - master
  - test/gitlab-ci
  environment:
  name: production