From aecdeddc322fd8da08dc227f74d899e23c509564 Mon Sep 17 00:00:00 2001
From: Casey Faist <caseylfaist@gmail.com>
Date: Wed, 28 Aug 2019 17:21:42 -0700
Subject: [PATCH] clean up rebase

---
 .gitignore                                        |  2 ++
 builds/cedar-14.Dockerfile~HEAD                   | 15 ---------------
 ...entral location, add all stacks, update README | 14 --------------
 ...ku-18.Dockerfile~HEAD => heroku-18.Dockerfile} |  0
 ...entral location, add all stacks, update README | 15 ---------------
 5 files changed, 2 insertions(+), 44 deletions(-)
 delete mode 100644 builds/cedar-14.Dockerfile~HEAD
 delete mode 100644 builds/cedar-14.Dockerfile~move Dockerfiles to central location, add all stacks, update README
 rename builds/{heroku-18.Dockerfile~HEAD => heroku-18.Dockerfile} (100%)
 delete mode 100644 builds/heroku-18.Dockerfile~move Dockerfiles to central location, add all stacks, update README

diff --git a/.gitignore b/.gitignore
index da8ab48..ea39393 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,5 @@ repos/*
 
 #Venv
 buildpack/*
+
+builds/dockerenv
diff --git a/builds/cedar-14.Dockerfile~HEAD b/builds/cedar-14.Dockerfile~HEAD
deleted file mode 100644
index ea11542..0000000
--- a/builds/cedar-14.Dockerfile~HEAD
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM heroku/cedar:14
-
-WORKDIR /app
-ENV WORKSPACE_DIR="/app/builds" \
-    S3_BUCKET="lang-python" \
-    S3_PREFIX="cedar-14/" \
-    DEBIAN_FRONTEND=noninteractive \
-    STACK="cedar-14"
-
-RUN apt-get update && apt-get install -y python-pip && rm -rf /var/lib/apt/lists/*
-
-COPY requirements.txt /app/
-RUN pip install -r /app/requirements.txt
-
-COPY . /app
diff --git a/builds/cedar-14.Dockerfile~move Dockerfiles to central location, add all stacks, update README b/builds/cedar-14.Dockerfile~move Dockerfiles to central location, add all stacks, update README
deleted file mode 100644
index f82fa16..0000000
--- a/builds/cedar-14.Dockerfile~move Dockerfiles to central location, add all stacks, update README	
+++ /dev/null
@@ -1,14 +0,0 @@
-FROM heroku/cedar:14
-
-WORKDIR /app
-ENV WORKSPACE_DIR="/app/builds" \
-    S3_BUCKET="lang-python" \
-    S3_PREFIX="cedar-14/" \
-    STACK="cedar-14"
-
-RUN apt-get update && apt-get install -y python-pip && rm -rf /var/lib/apt/lists/*
-
-COPY requirements.txt /app/
-RUN pip install -r /app/requirements.txt
-
-COPY . /app
diff --git a/builds/heroku-18.Dockerfile~HEAD b/builds/heroku-18.Dockerfile
similarity index 100%
rename from builds/heroku-18.Dockerfile~HEAD
rename to builds/heroku-18.Dockerfile
diff --git a/builds/heroku-18.Dockerfile~move Dockerfiles to central location, add all stacks, update README b/builds/heroku-18.Dockerfile~move Dockerfiles to central location, add all stacks, update README
deleted file mode 100644
index 6288ac0..0000000
--- a/builds/heroku-18.Dockerfile~move Dockerfiles to central location, add all stacks, update README	
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM heroku/heroku:18-build
-
-WORKDIR /app
-ENV WORKSPACE_DIR="/app/builds" \
-    S3_BUCKET="lang-python" \
-    S3_PREFIX="heroku-18/" \
-    DEBIAN_FRONTEND=noninteractive \
-    STACK="heroku-18"
-
-RUN apt-get update && apt-get install -y python-pip && rm -rf /var/lib/apt/lists/*
-
-COPY requirements.txt /app/
-RUN pip install --disable-pip-version-check --no-cache-dir -r /app/requirements.txt
-
-COPY . /app