From 97e3366409dfa3ff19e8cb694727592869861c69 Mon Sep 17 00:00:00 2001
From: David Zuelke <dzuelke@gmail.com>
Date: Wed, 13 Feb 2019 22:51:32 +0100
Subject: [PATCH] move Dockerfiles to central location, add all stacks, update
 README

---
 builds/README.md                                   |  2 ++
 ...edar-14.Dockerfile => cedar-14.Dockerfile~HEAD} |  0
 ...central location, add all stacks, update README | 13 +++++++++++++
 ...oku-18.Dockerfile => heroku-18.Dockerfile~HEAD} |  0
 ...central location, add all stacks, update README | 14 ++++++++++++++
 5 files changed, 29 insertions(+)
 rename builds/{cedar-14.Dockerfile => cedar-14.Dockerfile~HEAD} (100%)
 create mode 100644 builds/cedar-14.Dockerfile~move Dockerfiles to central location, add all stacks, update README
 rename builds/{heroku-18.Dockerfile => heroku-18.Dockerfile~HEAD} (100%)
 create mode 100644 builds/heroku-18.Dockerfile~move Dockerfiles to central location, add all stacks, update README

diff --git a/builds/README.md b/builds/README.md
index 200893a..e07fdf8 100644
--- a/builds/README.md
+++ b/builds/README.md
@@ -32,6 +32,8 @@ Out of the box, each `Dockerfile` has the correct values predefined for `S3_BUCK
 
 If you want to deploy packages and thus need to pass `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY`, you can either pass them explicitly, through your environment, or through an env file.
 
+If you want to deploy packages and thus need to pass `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY`, you can either pass them explicitly, through your environment, or through an env file.
+
 #### Passing credentials explicitly
 
     docker run --rm -ti -e AWS_ACCESS_KEY_ID=... -e AWS_SECRET_ACCESS_KEY=... heroku-python-build-heroku-18 bash
diff --git a/builds/cedar-14.Dockerfile b/builds/cedar-14.Dockerfile~HEAD
similarity index 100%
rename from builds/cedar-14.Dockerfile
rename to builds/cedar-14.Dockerfile~HEAD
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
new file mode 100644
index 0000000..921b437
--- /dev/null
+++ b/builds/cedar-14.Dockerfile~move Dockerfiles to central location, add all stacks, update README	
@@ -0,0 +1,13 @@
+FROM heroku/cedar:14
+
+WORKDIR /app
+ENV WORKSPACE_DIR="/app/builds" \
+    S3_BUCKET="lang-python" \
+    S3_PREFIX="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 b/builds/heroku-18.Dockerfile~HEAD
similarity index 100%
rename from builds/heroku-18.Dockerfile
rename to builds/heroku-18.Dockerfile~HEAD
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
new file mode 100644
index 0000000..466506a
--- /dev/null
+++ b/builds/heroku-18.Dockerfile~move Dockerfiles to central location, add all stacks, update README	
@@ -0,0 +1,14 @@
+FROM heroku/heroku:18-build
+
+WORKDIR /app
+ENV WORKSPACE_DIR="/app/builds" \
+    S3_BUCKET="lang-python" \
+    S3_PREFIX="heroku-18/" \
+    DEBIAN_FRONTEND=noninteractive
+
+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