Move deploy into a script

jonathonsim · jonathonsim · commit 42668c283fa4 · 2018-01-15T23:42:26.000Z
diff --git a/buildspec-4-sftpdeploy.yml b/buildspec-4-sftpdeploy.yml
@@ -77,37 +77,7 @@ phases:
      - aws s3 sync --delete  coverage/ "s3://${COVERAGE_S3_BUCKET}/coverage"
 
      # Deployment to the SFTP server
-     - |
-        set -e
-        cat /codebuild/output/tmp/script.sh
-
-        # Determine what git branch we're on, we only want to deploy master
-        export CODEBUILD_GIT_BRANCH=`git symbolic-ref HEAD --short 2>/dev/null`
-        if [ "$CODEBUILD_GIT_BRANCH" == "" ] ; then
-          CODEBUILD_GIT_BRANCH=`git branch -a --contains HEAD | sed -n 2p | awk '{ printf $1 }'`
-          export CODEBUILD_GIT_BRANCH=${CODEBUILD_GIT_BRANCH#remotes/origin/}
-        fi
-
-        echo "On branch $CODEBUILD_GIT_BRANCH"
-        if  [ "$CODEBUILD_GIT_BRANCH" != 'master' ]; then
-          echo "On branch $CODEBUILD_GIT_BRANCH ; not deploying as not master"
-          exit 0
-        fi
-
-        # Install SSH client so we can deploy
-        apt-get install -y openssh-client rsync
-
-        # Setup the SSH key
-        mkdir ~/.ssh
-        chmod 700 ~/.ssh
-        echo $SSH_KEY | base64 -d > ~/.ssh/id_rsa
-        chmod 600 ~/.ssh/*
-
-        # Upload Files
-        rsync -arvce --delete-after "ssh -o StrictHostKeyChecking=no -p ${SFTP_PORT}"  . ${SSH_USERNAME}@${SSH_SERVER}:~/public_html/
-
-        # Run any necessary remote commands
-        ssh -o "StrictHostKeyChecking=no"  ${SSH_USERNAME}@${SSH_SERVER} -p ${SSH_PORT} 'cd public_html ; composer install --optimize-autoloader; php artisan migrate'
+     - ./codebuild-deploy.sh
 
 cache:
   paths:
diff --git a/codebuild-deploy.sh b/codebuild-deploy.sh
@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+set -e
+
+# Determine what git branch we're on, we only want to deploy master
+export CODEBUILD_GIT_BRANCH=`git symbolic-ref HEAD --short 2>/dev/null`
+if [ "$CODEBUILD_GIT_BRANCH" == "" ] ; then
+    CODEBUILD_GIT_BRANCH=`git branch -a --contains HEAD | sed -n 2p | awk '{ printf $1 }'`
+    export CODEBUILD_GIT_BRANCH=${CODEBUILD_GIT_BRANCH#remotes/origin/}
+fi
+
+echo "On branch $CODEBUILD_GIT_BRANCH"
+if  [ "$CODEBUILD_GIT_BRANCH" != 'master' ]; then
+    echo "On branch $CODEBUILD_GIT_BRANCH ; not deploying as not master"
+    exit 0
+fi
+
+# Install SSH client so we can deploy
+apt-get install -y openssh-client rsync
+
+# Setup the SSH key
+mkdir ~/.ssh
+chmod 700 ~/.ssh
+echo $SSH_KEY | base64 -d > ~/.ssh/id_rsa
+chmod 600 ~/.ssh/*
+
+# Upload Files
+rsync -arvce --delete-after "ssh -o StrictHostKeyChecking=no -p ${SFTP_PORT}"  . ${SSH_USERNAME}@${SSH_SERVER}:~/public_html/
+
+# Run any necessary remote commands
+ssh -o "StrictHostKeyChecking=no"  ${SSH_USERNAME}@${SSH_SERVER} -p ${SSH_PORT} 'cd public_html ; composer install --optimize-autoloader; php artisan migrate'
