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", ]