From fa847d28f08938bf739cb39ea59398c79551b4b1 Mon Sep 17 00:00:00 2001
From: Devon Mackay <devon@dds.mil>
Date: Fri, 21 Sep 2018 11:55:33 -0400
Subject: [PATCH] Update workflow to add buildinfo files to directory structure
 before container is built

---
 .travis.yml                     | 2 +-
 deploy/docker/tester/Dockerfile | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c131916a..5ea87ca8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,13 +29,13 @@ before_script:
   - docker run --link postgres96:postgres96 --link redis:redis waisbrot/wait
   - export postgres_ip="$(docker inspect -f "{{ .NetworkSettings.IPAddress }}" postgres96)"
   - export redis_ip="$(docker inspect -f "{{ .NetworkSettings.IPAddress }}" redis)"
+  - ./script/generate_build_info.sh
   - docker login -u $ATAT_DOCKER_REGISTRY_USERNAME -p $ATAT_DOCKER_REGISTRY_PASSWORD $ATAT_DOCKER_REGISTRY_URL
   - docker build --tag "${TESTER_IMAGE1_NAME}" --add-host "postgreshost:${postgres_ip}" --add-host "redishost:${redis_ip}" . -f deploy/docker/tester/Dockerfile
 
 script:
   - docker run -d --entrypoint='/bin/sh' -t --name current-atst-tester "${TESTER_IMAGE1_NAME}"
   - docker container exec -t current-atst-tester script/sync-crls
-  - docker container exec -t current-atst-tester script/generate_build_info.sh
   - docker commit
     --change='ENTRYPOINT ["/usr/bin/dumb-init", "--"]'
     --change='CMD ["bash", "-c", "${APP_DIR}/script/cibuild"]'
diff --git a/deploy/docker/tester/Dockerfile b/deploy/docker/tester/Dockerfile
index 51b1badc..5486ffa1 100644
--- a/deploy/docker/tester/Dockerfile
+++ b/deploy/docker/tester/Dockerfile
@@ -31,10 +31,6 @@ COPY script/ ./script/
 RUN set -x ; \
   script/alpine_setup
 
-# Add git for buildinfo, which only the tester needs
-RUN set -x ; \
-  apk add git
-
 ### Items that will change almost every build
 #############################################
 # Copy over the rest of the app source