(feat): use gitlab container repository vs mac to sand badwidth

-subdomain: sgtpepper

.gitlab-ci.yml

@@ -41,9 +41,8 @@ prepare:fpm:
  stage: prepare
  image: minds/ci:latest
  script:
- - $(aws ecr get-login --no-include-email --region us-east-1)
- - docker build -t $REPOSITORY_URL_FPM-$CI_BUILD_REF -f containers/php-fpm/Dockerfile .
- - docker push $REPOSITORY_URL_FPM-$CI_BUILD_REF
+ - docker build -t $CI_REGISTRY_IMAGE/fpm:$CI_BUILD_REF -f containers/php-fpm/Dockerfile .
+ - docker push $CI_REGISTRY_IMAGE/fpm:$CI_BUILD_REF
  environment:
  name: staging
 
@@ -51,9 +50,8 @@ prepare:runners:
  stage: prepare
  image: minds/ci:latest
  script:
- - $(aws ecr get-login --no-include-email --region us-east-1)
- - docker build -t $REPOSITORY_URL_RUNNERS-$CI_BUILD_REF -f containers/php-runners/Dockerfile .
- - docker push $REPOSITORY_URL_RUNNERS-$CI_BUILD_REF
+ - docker build -t $CI_REGISTRY_IMAGE/runners:$CI_BUILD_REF -f containers/php-runners/Dockerfile .
+ - docker push $CI_REGISTRY_IMAGE/runners:$CI_BUILD_REF
  environment:
  name: staging
 
@@ -61,6 +59,8 @@ staging:start:
  stage: staging
  image: minds/ci:latest
  script:
+ - $(aws ecr get-login --no-include-email --region us-east-1)
+ - aws eks update-kubeconfig --name=$EKS_NAME
  - STAGING_SUBDOMAIN=$(echo $CI_COMMIT_MESSAGE | awk -F'-subdomain:' '{print $2}')
  - echo "Subdomain will be setup at $STAGING_SUBDOMAIN"
  only:
@@ -71,6 +71,8 @@ staging:stop:
  stage: staging
  image: minds/ci:latest
  script:
+ - $(aws ecr get-login --no-include-email --region us-east-1)
+ - aws eks update-kubeconfig --name=$EKS_NAME
  - STAGING_SUBDOMAIN=$(echo $CI_COMMIT_MESSAGE | awk -F'-subdomain:' '{print $2}') 
  - echo "TODO tear down $STAGING_SUBDOMAIN"
  when: manual
@@ -83,7 +85,8 @@ deploy:fpm:
  image: minds/ci:latest
  script:
  - $(aws ecr get-login --no-include-email --region us-east-1)
- - docker tag $REPOSITORY_URL_FPM-$CI_BUILD_REF $REPOSITORY_URL_FPM
+ - docker pull $CI_REGISTRY_IMAGE/fpm:$CI_BUILD_REF
+ - docker tag $CI_REGISTRY_IMAGE/fpm:$CI_BUILD_REF $REPOSITORY_URL_FPM
  - docker push $REPOSITORY_URL_FPM
  - aws ecs update-service --service=$SERVICE_FPM --force-new-deployment --region us-east-1 --cluster=$CLUSTER
  only:
@@ -98,7 +101,8 @@ deploy:runners:
  image: minds/ci:latest
  script:
  - $(aws ecr get-login --no-include-email --region us-east-1)
- - docker tag $REPOSITORY_URL_RUNNERS-$CI_BUILD_REF $REPOSITORY_URL_RUNNERS
+ - docker pull $CI_REGISTRY_IMAGE/runners:$CI_BUILD_REF
+ - docker tag $CI_REGISTRY_IMAGE/runners:$CI_BUILD_REF $REPOSITORY_URL_RUNNERS
  - docker push $REPOSITORY_URL_RUNNERS
  - aws ecs update-service --service=$SERVICE_RUNNERS --force-new-deployment --region us-east-1 --cluster=$CLUSTER
  only: