From 46c90a68b0fe9ee86c2fa15c35853340d18f0293 Mon Sep 17 00:00:00 2001
From: Brandon Webster <brandon.webster@socrata.com>
Date: Mon, 30 Mar 2020 16:09:19 -0700
Subject: [PATCH] EN-38189 - freeze reqs in container not jenkins

---
 Dockerfile            |  5 ++++-
 bin/dockerize.sh      |  1 -
 bin/freeze-reqs.sh    | 12 +-----------
 bin/start-renderer.sh |  3 +--
 4 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8773479..481abd9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,10 @@ RUN mkdir -p /app/carto_renderer
 
 ENV LOG_LEVEL INFO
 
-ADD frozen.txt /app/
+COPY bin/freeze-reqs.sh /app/
+COPY dev-requirements.txt /app/
+RUN chmod +x /app/freeze-reqs.sh
+RUN /app/freeze-reqs.sh
 RUN pip install -r /app/frozen.txt
 
 COPY ship.d /etc/ship.d/
diff --git a/bin/dockerize.sh b/bin/dockerize.sh
index edb3535..f35a1b2 100755
--- a/bin/dockerize.sh
+++ b/bin/dockerize.sh
@@ -3,6 +3,5 @@
 set -e
 
 cd "$(git rev-parse --show-toplevel 2>/dev/null)" 
-bin/freeze-reqs.sh
 docker build --rm -t carto-renderer .
 
diff --git a/bin/freeze-reqs.sh b/bin/freeze-reqs.sh
index ac5f5c0..fa931cf 100755
--- a/bin/freeze-reqs.sh
+++ b/bin/freeze-reqs.sh
@@ -3,17 +3,7 @@
 set -ev
 
 # Change to the project root.
-cd "$(git rev-parse --show-toplevel 2>/dev/null)"
-
-VENV_DIR="venv"
-if [ "${HUDSON_HOME}" ]; then
-    VENV_DIR="${HUDSON_HOME}/carto-renderer/${VENV_DIR}"
-fi
-
-if [ ! -d "${VENV_DIR}" ]; then
-    virtualenv "${VENV_DIR}"
-fi
-source "${VENV_DIR}"/bin/activate
+cd /app
 
 DEV_FILE='dev-requirements.txt'
 FROZEN_FILE='frozen.txt'
diff --git a/bin/start-renderer.sh b/bin/start-renderer.sh
index 72ce5c8..bfaf78e 100755
--- a/bin/start-renderer.sh
+++ b/bin/start-renderer.sh
@@ -19,8 +19,7 @@ if [ '--dev' = "$1" ]; then
     PYTHONPATH=. carto_renderer/service.py
 else
     bin/dockerize.sh
-    rm frozen.txt
-    
+
     if [ 'Darwin' = "$(uname)" ]; then
         OPTS=(-p 4096:4096 -e 'STYLE_HOST=docker.for.mac.localhost')
     else