Skip to content

Commit

Permalink
Recreate Dockerfile
Browse files Browse the repository at this point in the history
- Update to Python 3
- Simpler installation, remove docker-stacker script
- Add apk 'make' package. Useful for CI/CD builds
  • Loading branch information
Steven Ringo committed Nov 22, 2019
1 parent 8489dbb commit 194ab29
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 25 deletions.
23 changes: 10 additions & 13 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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"]
11 changes: 0 additions & 11 deletions scripts/docker-stacker

This file was deleted.

1 change: 0 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@

scripts = [
"scripts/compare_env",
"scripts/docker-stacker",
"scripts/stacker.cmd",
"scripts/stacker",
]
Expand Down

0 comments on commit 194ab29

Please sign in to comment.