Cleanup scripts and add encrypted creds

Author: AllenAnthes

.travis.yml

@@ -1,34 +1,37 @@
 env:
   global:
-  - IMAGE_NAME=pybot
-  - DEPLOY_BRANCHES="master staging"
-  - AWS_REGION=us-east-2
-  - secure: DcEpdVJ6LoHSLigVem++aZGn0kq74oyPIk/Zifz61NE7nDbustbXahgtMCkiv7dqyd1nqc6E/9S/DZ5dUoWPeeG/VPKkm+Ylk0jZcVLPwSd9S3oICLIZVwL8bG+FwYEY08kGl20rbTMAZT3zIhT0HMmw59UVYr7Lke9vLy2sZKi3nZv7L6miiIBwK3DFuUx3cPTtNXiaszBbUmFLNTNg6ehig2W+FwhHEG2wmd+On5nmArdaXfBDKMXT748aA2y3OG3PTrXdC5OEi0oIaf/8MimIJWzxkoMS8jFoyDSXFOCOzQucv7uAsZHZRACP2HHV5iqOLIo5E6dlONKJFP7TCYqYTzZF8Dz9TUjIMkr+zAeCMrlMzOCVD3qquUoW++s6F71IHGlavqZvMTApyaRCIZanwHk/Tb96/s87bsFPYoGrsInQjfhhPUHTCxZrkBqZg8UegbZJ+HyH+I0bK9WM5mFyeQ7swRFkaQ6MICmqWF0w8JrJUAkOci3Q6NO1+7NBDNT5F3arhHgKMHpw0ry3iuUU1I7Unh8QdzNIgdcAh7TAgI8n0CjBXHf22+ZI0ph4Og7blZ17h9idSj72Ll8a7Rnj3/FgtB7HE1nQMzZfBtiN6txZAhM1ADIDj6NmaIXF+2hkQDnGczGaLqNHlKb14nNfdiWnO8Wf9DKCFZS8iKk=
-  - secure: XPvMPMkCIBORXmFSwnSVm6rOF1mHcipzgo9IdbFu87dFFC2mJG/T8UTbEyTLpjpM8WvcSawmpWHtqlhbHXnEj+6ugEongvYsl0wYh/KNU9oS5vw38CvxpvIIg3PyTS39Dp8QtP/y/EaeZPPQiN/soiNGQ0EQ9V/eazjO9Gc9vTvYfPdSc3Q4UjxAqf550L+pkEF6NSh0Lo3ShCr1sai+XCvyvYeTTtwZzufIzq/aNxs+dPUc0FDXdZ5L+J2Ds/yxXAaVcQzSfhdxV1igCcQ6HesndsrrM6DIOTPtzFhpeA3RHaNxrAeh9ZXvYoLkXbyxEmraSRTx0PBjBLNkZNNorOB/ebWj3s1CK5I/3qrZ7WVIq/keDea1Ict9g7moYe8/OLQO0b0/gNqkR/jpepSbfxnEF41DNhJ2xSSE9niuEaUnpDpCibhLCqtXGbRK90dIjnkLHemxL8mrujwm7XDHcTK+GsA5ceBMHk0aQ9WDrKPCQGw8DlQ6EfgnOd/61Dq5vMZW8cC60h8EQNQFQ3KBgEEELpNSltvaf4FYA3Og+Vie/VStjCzDuGohghKiiaGFBWUGtaQGyr4cuwCI88iAU4/LiTz83JAv7+6tD+vsczV8Bdlg360Mquc01E7Vw9Qmtvh1kRWLicA6dUemrUqHO79izqAhhmLhz5dCBZOOGoM=
-  - AIRTABLE_API_KEY=apiKey
-  - AIRTABLE_BASE_KEY=baseKey
-  - AIRTABLE_VERIFY=verify
-  - REMOTE_IMAGE_URL=633607774026.dkr.ecr.us-east-2.amazonaws.com/pybot
-  - ECS_CLUSTER_MASTER=python-oc-services
-  - ECS_SERVICE_MASTER=pybot-svc
-  - ECS_CLUSTER_STAGING=python-oc-services
-  - ECS_SERVICE_STAGING=pybot-svc-staging
-  - PIPENV_CACHE_DIR=~./.cache/pip
+    - IMAGE_NAME=pybot
+    - DEPLOY_BRANCHES="master staging"
+    - AWS_REGION=us-east-2
+    - secure: DcEpdVJ6LoHSLigVem++aZGn0kq74oyPIk/Zifz61NE7nDbustbXahgtMCkiv7dqyd1nqc6E/9S/DZ5dUoWPeeG/VPKkm+Ylk0jZcVLPwSd9S3oICLIZVwL8bG+FwYEY08kGl20rbTMAZT3zIhT0HMmw59UVYr7Lke9vLy2sZKi3nZv7L6miiIBwK3DFuUx3cPTtNXiaszBbUmFLNTNg6ehig2W+FwhHEG2wmd+On5nmArdaXfBDKMXT748aA2y3OG3PTrXdC5OEi0oIaf/8MimIJWzxkoMS8jFoyDSXFOCOzQucv7uAsZHZRACP2HHV5iqOLIo5E6dlONKJFP7TCYqYTzZF8Dz9TUjIMkr+zAeCMrlMzOCVD3qquUoW++s6F71IHGlavqZvMTApyaRCIZanwHk/Tb96/s87bsFPYoGrsInQjfhhPUHTCxZrkBqZg8UegbZJ+HyH+I0bK9WM5mFyeQ7swRFkaQ6MICmqWF0w8JrJUAkOci3Q6NO1+7NBDNT5F3arhHgKMHpw0ry3iuUU1I7Unh8QdzNIgdcAh7TAgI8n0CjBXHf22+ZI0ph4Og7blZ17h9idSj72Ll8a7Rnj3/FgtB7HE1nQMzZfBtiN6txZAhM1ADIDj6NmaIXF+2hkQDnGczGaLqNHlKb14nNfdiWnO8Wf9DKCFZS8iKk=
+    - secure: XPvMPMkCIBORXmFSwnSVm6rOF1mHcipzgo9IdbFu87dFFC2mJG/T8UTbEyTLpjpM8WvcSawmpWHtqlhbHXnEj+6ugEongvYsl0wYh/KNU9oS5vw38CvxpvIIg3PyTS39Dp8QtP/y/EaeZPPQiN/soiNGQ0EQ9V/eazjO9Gc9vTvYfPdSc3Q4UjxAqf550L+pkEF6NSh0Lo3ShCr1sai+XCvyvYeTTtwZzufIzq/aNxs+dPUc0FDXdZ5L+J2Ds/yxXAaVcQzSfhdxV1igCcQ6HesndsrrM6DIOTPtzFhpeA3RHaNxrAeh9ZXvYoLkXbyxEmraSRTx0PBjBLNkZNNorOB/ebWj3s1CK5I/3qrZ7WVIq/keDea1Ict9g7moYe8/OLQO0b0/gNqkR/jpepSbfxnEF41DNhJ2xSSE9niuEaUnpDpCibhLCqtXGbRK90dIjnkLHemxL8mrujwm7XDHcTK+GsA5ceBMHk0aQ9WDrKPCQGw8DlQ6EfgnOd/61Dq5vMZW8cC60h8EQNQFQ3KBgEEELpNSltvaf4FYA3Og+Vie/VStjCzDuGohghKiiaGFBWUGtaQGyr4cuwCI88iAU4/LiTz83JAv7+6tD+vsczV8Bdlg360Mquc01E7Vw9Qmtvh1kRWLicA6dUemrUqHO79izqAhhmLhz5dCBZOOGoM=
+    - AIRTABLE_API_KEY=apiKey
+    - AIRTABLE_BASE_KEY=baseKey
+    - AIRTABLE_VERIFY=verify
+    - ECS_CLUSTER_MASTER=python-oc-services
+    - ECS_SERVICE_MASTER=pybot-svc
+    - ECS_CLUSTER_STAGING=python-oc-services
+    - ECS_SERVICE_STAGING=pybot-svc-staging
+    - PIPENV_CACHE_DIR=~./.cache/pip
+    - REMOTE_IMAGE_URL=docker.io/operationcodetest/pybot
+    - DOCKER_REPO="operationcodetest/pybot"
+    - secure: rOEZjJrYS1CVGBGlRWUgfzL+prI9OMSOd7e2l/Ki2OIoknkKcOxJYxgbDUaA2BLVS3zvzd2yRrxAOW3K/w6j/yzxDLFvZ2S/4G3wMdhgMN+yQnEIXfRwBmUTVpdL2qI4+fJD1nWjvlqJ3N6G1q5Ld87+h/Ixe03MHBv63fwBoIhImtg7mZCG2m1zIMJlCiV+ipiU0brFg80+Oz9rxM0xiTdI1tnDBJ9ySdIvpI/nR7ZskDWi3pXfa57iFGku3OpIf+5nRuNPP0xlrAsvcnTVsk3h2OOddFNNHxAKeqiaczBn56exhDs6rC/HAxom1wUbJB2I/kWRooIz+adUkpgJw9w5Wvt/vGHggAmoqLkeMmDG3PH+IaIu8dqg7D5Lrn2kdW/ImpC+E7CUZYhLGbl82DAnGl7RIU8QEq6fp9bwDbc3nQ3F0OIop7nq6tHBAojvuUnV8EN7de1o8mL4mW+u19d6kzLyYbUptl9arb8/VHJakkRcpK0n+Mdr3CwQOJbtUReNMNwaM99vNuYV2TLDRnP6yoQy2pU6+SSQN6xA8xnIqbTVSe7wam3x8Lj+rxvdu+a/7J4VIdsGSGYxs/7YiKiHkpqRLDUVeLMAQriJzO2QHPTLZJrHeYQALwLkuwLoNX8nT0DHSNYlskiyrWxZhuYu5dBSEYAkQ8+0wW0teY4=
+    - secure: Lbu9pE+5b7+7cw65rSkkPDLx+bvmFTHFAeALpwruuOBJNdHkIatymJnPg3pROlz3Bli/F5zCBOGnimyVKRxQq8qbBZn+ImJKc7lFTQ8GIJ9/jo2ANtsacoipxoBGKTh9cqCwIron2HvP4IwzSvLebrvdQUDUL93HMVcfNqMsR2yZloJLflAoP5Vo33qOsCVCHbjlUWkSbYP03Aq5GrPahHIRrqdWl8rNCeJWbluH3UTv9FuhGgf/0PBA67rNHbL//WCjxvaTyHxJGCqRTUl4uFUyl8nJAEha4c/PDWYRDsDYdVPfV+7v8rVa0RX8xll9nFn3cICeBsZR0fw1ujzqgFE1EXSkiYwNj225sjfR2uRtjxHwMsCmsPZVZiSQF0pC8jqHFI5428tSW3O6oaCU/e5m/HuLc0coC/CAhxDTE28E8eBMZoupF1apBMnHqplmcU4E0TLIPZY1iK7QFkvqdulw4fIc9om9wV1D/GTDOoWogjaoILqdtuskrCtReabvWs8OBsjTHe0gsiAoYVBQ/3N1YxjEyzzWvATXmfo5wbHTuKBnjaROAQ2jM2sawnRDHSDNMdyxSmyx6tjYkHQX0Lhw17/srtkjzb+01tHZ8ZvEeuI7AfZzkmSpaE3juyaY1YIMDZRQRINfaBdA0rq0yVz988MdRly88m/xXcg4s9U=
 os: linux
 cache: pip
 sudo: required
 language: python
 dist: xenial
 python: 3.7
 install:
-- pip install pipenv
-- pipenv install --system --deploy --dev
+  - pip install pipenv
+  - pipenv install --system --deploy --dev
 script:
-- pytest
+  - pytest
 services:
-- docker
+  - docker
 after_success:
-- bash bin/run.sh
+  - bash bin/run.sh
 notifications:
   slack:
     rooms:

bin/build bin/build.shbin/build renamed to bin/build.sh

@@ -6,4 +6,3 @@ source "${SCRIPTDIR}/../lib/util.sh"
 
 echo "Building Docker image..."
 runCommand "docker build -t $IMAGE_NAME -f docker/Dockerfile ." || exit $?
-

bin/deploy bin/deploy.shbin/deploy renamed to bin/deploy.sh

@@ -2,10 +2,10 @@
 
 set -eu
 
-TRAVIS_BRANCH_UPPERCASE=$(echo $TRAVIS_BRANCH | awk '{print toupper($0)}')
+TRAVIS_BRANCH_UPPERCASE=$(echo ${TRAVIS_BRANCH} | awk '{print toupper($0)}')
 
 CLUSTER_NAME=ECS_CLUSTER_${TRAVIS_BRANCH_UPPERCASE}
 SERVICE_NAME=ECS_SERVICE_${TRAVIS_BRANCH_UPPERCASE}
 
 echo "Deploying $TRAVIS_BRANCH on service ${!SERVICE_NAME} on cluster ${!CLUSTER_NAME} with image $REMOTE_IMAGE_URL:$TRAVIS_BRANCH"
-bash ${SCRIPTDIR}/../lib/ecs-deploy -t 300 -n ${!SERVICE_NAME} -c ${!CLUSTER_NAME} -r $AWS_REGION -i $REMOTE_IMAGE_URL:$TRAVIS_BRANCH
+bash ${SCRIPTDIR}/../lib/ecs-deploy -t 300 -n ${!SERVICE_NAME} -c ${!CLUSTER_NAME} -r ${AWS_REGION} -i ${REMOTE_IMAGE_URL}:${TRAVIS_BRANCH}

bin/publish

@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+
+# Publishes the most recent web container to docker hubs repo.
+# This script assumes docker push works.
+# You must set up docker push on your own.
+
+set -eu
+
+DOCKER_REPO="operationcode/pybot"
+
+IMAGE_ID=$(docker images $IMAGE_NAME:latest --format "{{.ID}}")
+
+if [[ -n "$DOCKER_USERNAME" ]]; then
+    echo "Found username";
+fi
+if [[ -n "$DOCKER_PASSWORD" ]]; then
+    echo "Found password";
+fi
+
+if [[ -n "$DOCKER_USERNAME" ]] && [[ -n "$DOCKER_PASSWORD" ]]; then
+    echo "Logging in using ENV creds"
+    docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
+fi
+
+echo "Pushing image $IMAGE_NAME:$TRAVIS_BRANCH"
+docker tag ${IMAGE_ID} ${DOCKER_REPO}
+docker tag ${IMAGE_ID} ${DOCKER_REPO}:${TRAVIS_BUILD_NUMBER}
+#docker push ${DOCKER_REPO}
+docker push ${DOCKER_REPO}:${TRAVIS_BUILD_NUMBER}

bin/publish.sh

@@ -9,39 +9,40 @@ fi
 # Don't process pull requests
 # $TRAVIS_PULL_REQUEST will be the PR number or "false" if not a PR
 if [[ -n "$TRAVIS_PULL_REQUEST" ]] && [[ "$TRAVIS_PULL_REQUEST" != "false" ]]; then
-  echo "Skipping deploy because it's a pull request"
-  exit 0
+    echo "Skipping deploy because it's a pull request"
+    exit 0
 fi
 
 # Only process branches listed in DEPLOY_BRANCHES
-BRANCHES_TO_DEPLOY=($DEPLOY_BRANCHES)
+BRANCHES_TO_DEPLOY=( ${DEPLOY_BRANCHES} )
 if [[ ! " ${BRANCHES_TO_DEPLOY[@]} " =~ " ${TRAVIS_BRANCH} " ]]; then
-  # whatever you want to do when arr contains value
-  echo "Skipping deploy, not a branch to be deployed"
-  exit 0
+    # whatever you want to do when arr contains value
+    echo "Skipping deploy, not a branch to be deployed"
+    exit 0
 fi
 
 pip install awscli -q
 
-if [ $? = 0 ]; then
-  AWSBIN=$(which aws)
-  AWSPATH=$(dirname $AWSBIN)
-  export PATH=$PATH:$AWSPATH
-
-  # Get absolute path of dir where run.sh is located
-  SOURCE="${BASH_SOURCE[0]}"
-  while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
-    DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
-    SOURCE="$(readlink "$SOURCE")"
-    [[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
-  done
-  export SCRIPTDIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
-
-  bash ${SCRIPTDIR}/build &&
-  bash ${SCRIPTDIR}/publish &&
-  bash ${SCRIPTDIR}/deploy
+if [[ $? = 0 ]]; then
+    AWSBIN=$(which aws)
+    AWSPATH=$(dirname ${AWSBIN})
+    export PATH=$PATH:${AWSPATH}
+
+    # Get absolute path of dir where run.sh is located
+    SOURCE="${BASH_SOURCE[0]}"
+    while [[ -h "$SOURCE" ]]; do
+        # resolve $SOURCE until the file is no longer a symlink
+        DIR="$(cd -P "$(dirname "$SOURCE")" && pwd)"
+        SOURCE="$(readlink "$SOURCE")"
+        [[ ${SOURCE} != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
+    done
+    export SCRIPTDIR="$(cd -P "$(dirname "$SOURCE")" && pwd)"
+
+    bash ${SCRIPTDIR}/build.sh &&
+    bash ${SCRIPTDIR}/publish.sh &&
+    bash ${SCRIPTDIR}/deploy.sh
 
 else
-  echo "Failed to install AWS CLI"
-  exit 1
+    echo "Failed to install AWS CLI"
+    exit 1
 fi