From b9d18a3929a0559748f1653c822a30e6723feafd Mon Sep 17 00:00:00 2001 From: Sergey Grebenshchikov Date: Sat, 9 Jun 2018 13:43:39 +0200 Subject: [PATCH 1/2] Add Dockerfile and .dockerignore, and redditdl.py dependencies --- .dockerignore | 5 +++++ Dockerfile | 5 +++++ setup.py | 5 ++++- 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 .dockerignore create mode 100644 Dockerfile diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..91a420f --- /dev/null +++ b/.dockerignore @@ -0,0 +1,5 @@ +* +!redditdl.py +!setup.py +!redditdownload +!readme.md diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..c75198b --- /dev/null +++ b/Dockerfile @@ -0,0 +1,5 @@ +FROM python:2.7.15-alpine3.7 +COPY . /app +RUN pip install /app[redditdl.py] && redditdl.py -h +WORKDIR /data +ENTRYPOINT [ "redditdl.py" ] diff --git a/setup.py b/setup.py index c9a8486..5014b44 100755 --- a/setup.py +++ b/setup.py @@ -23,7 +23,7 @@ packages=['redditdownload'], entry_points={ 'console_scripts': [ - 'redditdl.py = redditdownload.redditdownload:main', + 'redditdl.py = redditdownload.redditdownload:main [redditdl]', ], }, install_requires=[ @@ -32,6 +32,9 @@ # any non-core libraries. ], extras_require={ + 'redditdl.py': [ + 'bs4' + ], 'recommended': [ 'bs4', 'lxml', From 1cc81840ea417517503126eea654f6dde8062833 Mon Sep 17 00:00:00 2001 From: Sergey Grebenshchikov Date: Thu, 14 Jun 2018 17:34:13 +0200 Subject: [PATCH 2/2] Revert changes in setup.py, only add Dockerfile --- Dockerfile | 4 +++- setup.py | 5 +---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index c75198b..8fc284b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,7 @@ FROM python:2.7.15-alpine3.7 +RUN pip install bs4 COPY . /app -RUN pip install /app[redditdl.py] && redditdl.py -h +RUN pip install /app +RUN redditdl.py -h WORKDIR /data ENTRYPOINT [ "redditdl.py" ] diff --git a/setup.py b/setup.py index 5014b44..c9a8486 100755 --- a/setup.py +++ b/setup.py @@ -23,7 +23,7 @@ packages=['redditdownload'], entry_points={ 'console_scripts': [ - 'redditdl.py = redditdownload.redditdownload:main [redditdl]', + 'redditdl.py = redditdownload.redditdownload:main', ], }, install_requires=[ @@ -32,9 +32,6 @@ # any non-core libraries. ], extras_require={ - 'redditdl.py': [ - 'bs4' - ], 'recommended': [ 'bs4', 'lxml',