Move deployment scripts to a subdirectory

robtagg · Aug 24, 2018 · 7bab0a5 · 7bab0a5
1 parent 60ed52e
commit 7bab0a5
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -6,23 +6,23 @@ jobs:
       - image: docker:17.09.0-ce-git
     steps:
       - checkout
-      - setup_remote_docker
+      - setup_remote_docker:
+          docker_layer_caching: true
       - run:
           name: Set version
           command: |
             sed -i.bak "s#'dev'#'$(git describe --tags)'#" saleor/__init__.py
       - run:
           name: Build application Docker image
           command: |
-            docker pull mirumee/saleor:latest
             docker build \
               --build-arg AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID \
               --build-arg AWS_LOCATION=$AWS_LOCATION \
               --build-arg AWS_MEDIA_BUCKET_NAME=$AWS_MEDIA_BUCKET_NAME \
               --build-arg AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY \
               --build-arg AWS_STORAGE_BUCKET_NAME=$AWS_STORAGE_BUCKET_NAME \
               --build-arg STATIC_URL=$STATIC_URL \
-              --cache-from=mirumee/saleor:latest -t mirumee/saleor:latest .
+              -t mirumee/saleor:latest .
       - run:
           name: Run tests
           command: |

diff --git a/Dockerrun.aws.json → ...yment/elasticbeanstalk/Dockerrun.aws.json b/Dockerrun.aws.json → ...yment/elasticbeanstalk/Dockerrun.aws.json
diff --git a/scripts/deploy_master.sh b/scripts/deploy_master.sh
@@ -3,13 +3,14 @@
 VERSION=$CIRCLE_SHA1
 ZIP=$VERSION.zip
 
-zip -r $ZIP Dockerrun.aws.json
+cd deployment/elasticbeanstalk
+zip -r /tmp/$ZIP .
 
-aws s3 cp $ZIP s3://$VERSIONS_BUCKET/$ZIP
+#aws s3 cp /tmp/$ZIP s3://$VERSIONS_BUCKET/$ZIP
 
-aws elasticbeanstalk create-application-version --application-name saleor-demo \
-    --version-label $VERSION --source-bundle S3Bucket=$VERSIONS_BUCKET,S3Key=$ZIP
+#aws elasticbeanstalk create-application-version --application-name saleor-demo \
+#    --version-label $VERSION --source-bundle S3Bucket=$VERSIONS_BUCKET,S3Key=$ZIP
 
 # Update the environment to use the new application version
-aws elasticbeanstalk update-environment --environment-name $MASTER_ENV_NAME \
-      --version-label $VERSION
+#aws elasticbeanstalk update-environment --environment-name $MASTER_ENV_NAME \
+#      --version-label $VERSION