From 1a5f9dfc49b5c74cad6910df77a472b87eeb19e9 Mon Sep 17 00:00:00 2001
From: Devon Mackay <devon@dds.mil>
Date: Mon, 9 Jul 2018 14:57:45 -0400
Subject: [PATCH] Move docker files and update travis.yml accordingly

---
 .travis.yml                                 | 6 +++---
 {docker => deploy/docker}/prod/Dockerfile   | 0
 {docker => deploy/docker}/tester/Dockerfile | 0
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename {docker => deploy/docker}/prod/Dockerfile (100%)
 rename {docker => deploy/docker}/tester/Dockerfile (100%)

diff --git a/.travis.yml b/.travis.yml
index 9b5500d2..486de5cc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,15 +7,15 @@ env:
     - TESTER_IMAGE_NAME=atst-tester
     - PROD_IMAGE_NAME=atst-prod
 
-before_install:
+before_script:
   - docker login -u $ATAT_DOCKER_REGISTRY_USERNAME -p $ATAT_DOCKER_REGISTRY_PASSWORD $ATAT_DOCKER_REGISTRY_URL
-  - docker build --tag "${TESTER_IMAGE_NAME}" . -f docker/tester/Dockerfile
+  - docker build --tag "${TESTER_IMAGE_NAME}" . -f deploy/docker/tester/Dockerfile
 
 script:
   - docker run "${TESTER_IMAGE_NAME}"
 
 before_deploy:
-  - docker build --tag "${PROD_IMAGE_NAME}" . -f docker/prod/Dockerfile
+  - docker build --tag "${PROD_IMAGE_NAME}" . -f deploy/docker/prod/Dockerfile
   - git_sha="$(git rev-parse --short HEAD)"
   - remote_image_name="${ATAT_DOCKER_REGISTRY_URL}/${PROD_IMAGE_NAME}:${git_sha}"
   - docker tag "${PROD_IMAGE_NAME}" "${remote_image_name}"
diff --git a/docker/prod/Dockerfile b/deploy/docker/prod/Dockerfile
similarity index 100%
rename from docker/prod/Dockerfile
rename to deploy/docker/prod/Dockerfile
diff --git a/docker/tester/Dockerfile b/deploy/docker/tester/Dockerfile
similarity index 100%
rename from docker/tester/Dockerfile
rename to deploy/docker/tester/Dockerfile