From 8489dbb4ba6d32e6fc37fd656efbd57a26da0897 Mon Sep 17 00:00:00 2001
From: Steven Ringo <noreply@git.email>
Date: Fri, 22 Nov 2019 12:33:44 +1100
Subject: [PATCH 1/2] Tighten python-dateutil dependency version to address
 issue with current release of botocore See
 https://github.com/boto/botocore/issues/1872

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 3e6220c34..41897163f 100644
--- a/setup.py
+++ b/setup.py
@@ -16,7 +16,7 @@
     "jinja2>=2.7,<3.0",
     "schematics>=2.0.1,<2.1.0",
     "formic2",
-    "python-dateutil>=2.0,<3.0",
+    "python-dateutil>=2.0,<2.8",
 ]
 
 setup_requires = ['pytest-runner']

From 194ab29904ef6eab450b13c4d185ee40f5e06a87 Mon Sep 17 00:00:00 2001
From: Steven Ringo <noreply@git.email>
Date: Fri, 22 Nov 2019 12:36:47 +1100
Subject: [PATCH 2/2] Recreate Dockerfile - Update to Python 3 - Simpler
 installation, remove docker-stacker script - Add apk 'make' package. Useful
 for CI/CD builds

---
 Dockerfile             | 23 ++++++++++-------------
 scripts/docker-stacker | 11 -----------
 setup.py               |  1 -
 3 files changed, 10 insertions(+), 25 deletions(-)
 delete mode 100755 scripts/docker-stacker

diff --git a/Dockerfile b/Dockerfile
index 9f629f849..c72faee27 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,10 @@
-FROM python:2.7.10
-MAINTAINER Mike Barrett
-
-COPY scripts/docker-stacker /bin/docker-stacker
-RUN mkdir -p /stacks && pip install --upgrade pip setuptools
-WORKDIR /stacks
-COPY . /tmp/stacker
-RUN pip install --upgrade pip
-RUN pip install --upgrade setuptools
-RUN cd /tmp/stacker && python setup.py install && rm -rf /tmp/stacker
-
-ENTRYPOINT ["docker-stacker"]
-CMD ["-h"]
+FROM python:3.7-alpine
+RUN apk add --no-cache make
+WORKDIR /app
+COPY setup.cfg setup.py README.rst CHANGELOG.md ./
+COPY stacker/ ./stacker
+COPY scripts/ ./scripts
+RUN python setup.py install
+WORKDIR /project
+ENTRYPOINT ["stacker"]
+CMD ["--help"]
diff --git a/scripts/docker-stacker b/scripts/docker-stacker
deleted file mode 100755
index bc1f69eb8..000000000
--- a/scripts/docker-stacker
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-# This script is meant to be used from within the Docker image for stacker. It
-# simply installs the stacks at /stacks and then runs stacker.
-
-set -e
-
-cd /stacks
-python setup.py install
-
-exec stacker $@
diff --git a/setup.py b/setup.py
index 41897163f..c2185eef0 100644
--- a/setup.py
+++ b/setup.py
@@ -32,7 +32,6 @@
 
 scripts = [
     "scripts/compare_env",
-    "scripts/docker-stacker",
     "scripts/stacker.cmd",
     "scripts/stacker",
 ]