From 9f8c727898fa56b9d0da5f26cd34ee9f082a52f8 Mon Sep 17 00:00:00 2001 From: Zen Process Date: Sun, 29 Jan 2017 16:00:01 +0000 Subject: [PATCH 01/13] aded lxml --- latest/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/latest/Dockerfile b/latest/Dockerfile index 6deb234..fd92f63 100644 --- a/latest/Dockerfile +++ b/latest/Dockerfile @@ -20,6 +20,7 @@ ENV PACKAGES="\ ca-certificates \ python3 \ python3-dev \ + lxml\ " RUN echo \ From 6814890178c89f4c1ad77bd81871e30d065b5138 Mon Sep 17 00:00:00 2001 From: Zen Process Date: Sun, 29 Jan 2017 16:11:02 +0000 Subject: [PATCH 02/13] lxml --- latest/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/latest/Dockerfile b/latest/Dockerfile index fd92f63..74aac84 100644 --- a/latest/Dockerfile +++ b/latest/Dockerfile @@ -20,7 +20,7 @@ ENV PACKAGES="\ ca-certificates \ python3 \ python3-dev \ - lxml\ + python3-lxml \ " RUN echo \ From 9f0f93e3b273b5b72de503a0fbda60db0b1e3ec1 Mon Sep 17 00:00:00 2001 From: Zen Process Date: Sun, 29 Jan 2017 16:16:55 +0000 Subject: [PATCH 03/13] pip --- latest/Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/latest/Dockerfile b/latest/Dockerfile index 74aac84..4241885 100644 --- a/latest/Dockerfile +++ b/latest/Dockerfile @@ -20,7 +20,6 @@ ENV PACKAGES="\ ca-certificates \ python3 \ python3-dev \ - python3-lxml \ " RUN echo \ @@ -52,5 +51,8 @@ RUN echo \ && if [[ ! -e /usr/bin/pip ]]; then ln -sf /usr/bin/pip3 /usr/bin/pip; fi # since we will be "always" mounting the volume, we can set this up +RUN pip install lxml + + ENTRYPOINT ["/usr/bin/dumb-init"] CMD ["python"] From 7faef2cf806c38bcac119bfadb0a3ccbe6c427bc Mon Sep 17 00:00:00 2001 From: Zen Process Date: Sun, 29 Jan 2017 16:20:16 +0000 Subject: [PATCH 04/13] .. --- latest/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/latest/Dockerfile b/latest/Dockerfile index 4241885..7bf126b 100644 --- a/latest/Dockerfile +++ b/latest/Dockerfile @@ -20,6 +20,8 @@ ENV PACKAGES="\ ca-certificates \ python3 \ python3-dev \ + libxml2-dev \ + libxslt-dev \ " RUN echo \ From 9baa3bd60bf050297eda9c95c4e0b05aecf62443 Mon Sep 17 00:00:00 2001 From: Zen Process Date: Sun, 29 Jan 2017 16:30:02 +0000 Subject: [PATCH 05/13] .. --- latest/Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/latest/Dockerfile b/latest/Dockerfile index 7bf126b..f15e9b0 100644 --- a/latest/Dockerfile +++ b/latest/Dockerfile @@ -53,7 +53,10 @@ RUN echo \ && if [[ ! -e /usr/bin/pip ]]; then ln -sf /usr/bin/pip3 /usr/bin/pip; fi # since we will be "always" mounting the volume, we can set this up -RUN pip install lxml +RUN pip install lxml +RUN pip install requests +RUN pip install argparse + ENTRYPOINT ["/usr/bin/dumb-init"] From 5e53fa598856e6de52b608bde050df1d9db3e9a6 Mon Sep 17 00:00:00 2001 From: Zen Process Date: Wed, 1 Feb 2017 11:50:12 +0000 Subject: [PATCH 06/13] add xmljson and json --- latest/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/latest/Dockerfile b/latest/Dockerfile index f15e9b0..33b1aab 100644 --- a/latest/Dockerfile +++ b/latest/Dockerfile @@ -56,6 +56,8 @@ RUN echo \ RUN pip install lxml RUN pip install requests RUN pip install argparse +RUN pip install xmljson +RUN pip install json From c1754da3940073f27b34b869c25a0b68102b2efc Mon Sep 17 00:00:00 2001 From: Zen Process Date: Wed, 1 Feb 2017 12:00:19 +0000 Subject: [PATCH 07/13] remove json --- latest/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/latest/Dockerfile b/latest/Dockerfile index 33b1aab..2e9c983 100644 --- a/latest/Dockerfile +++ b/latest/Dockerfile @@ -57,7 +57,6 @@ RUN pip install lxml RUN pip install requests RUN pip install argparse RUN pip install xmljson -RUN pip install json From 20556338b776f58c030a7e733f4fb251608de435 Mon Sep 17 00:00:00 2001 From: Zen Process Date: Wed, 1 Feb 2017 16:26:50 +0000 Subject: [PATCH 08/13] 2.7 update --- 2.7/Dockerfile | 16 +++++++++++++--- 2.7/onbuild/Dockerfile | 3 +++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/2.7/Dockerfile b/2.7/Dockerfile index 1c5c72c..30dbe5e 100644 --- a/2.7/Dockerfile +++ b/2.7/Dockerfile @@ -11,6 +11,8 @@ FROM alpine:3.4 # * python: the binaries themselves # * python-dev: are used for gevent e.g. # * py-setuptools: required only in major version 2, installs easy_install so we can install Pip. + + ENV PACKAGES="\ dumb-init \ musl \ @@ -19,9 +21,10 @@ ENV PACKAGES="\ bash \ git \ ca-certificates \ - python2 \ - python2-dev \ - py-setuptools \ + python3 \ + python3-dev \ + libxml2-dev \ + libxslt-dev \ " RUN echo \ @@ -51,6 +54,13 @@ RUN echo \ && if [[ ! -e /usr/bin/pip ]]; then ln -sf /usr/bin/pip2.7 /usr/bin/pip; fi \ && echo + +RUN pip install lxml +RUN pip install requests +RUN pip install argparse +RUN pip install xmljson + + # since we will be "always" mounting the volume, we can set this up ENTRYPOINT ["/usr/bin/dumb-init"] CMD ["python"] diff --git a/2.7/onbuild/Dockerfile b/2.7/onbuild/Dockerfile index ac09e2a..1bad684 100644 --- a/2.7/onbuild/Dockerfile +++ b/2.7/onbuild/Dockerfile @@ -1,5 +1,8 @@ FROM jfloff/alpine-python:2.7 + + + # Copy in the entrypoint script -- this installs prerequisites on container start. COPY entrypoint.sh /entrypoint.sh From 0348a63eb850685c6b80f9dc2b2073ce449c1640 Mon Sep 17 00:00:00 2001 From: Zen Process Date: Wed, 1 Feb 2017 16:37:01 +0000 Subject: [PATCH 09/13] fix 2.7 --- 2.7/Dockerfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/2.7/Dockerfile b/2.7/Dockerfile index 30dbe5e..ce106c8 100644 --- a/2.7/Dockerfile +++ b/2.7/Dockerfile @@ -21,10 +21,8 @@ ENV PACKAGES="\ bash \ git \ ca-certificates \ - python3 \ - python3-dev \ libxml2-dev \ - libxslt-dev \ + libxslt-dev \ " RUN echo \ From 3e9ab80419dae7cbe5683b97fda4f2788d9d9042 Mon Sep 17 00:00:00 2001 From: Zen Process Date: Wed, 1 Feb 2017 17:01:54 +0000 Subject: [PATCH 10/13] mhm --- 2.7/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/2.7/Dockerfile b/2.7/Dockerfile index ce106c8..bbb5ae3 100644 --- a/2.7/Dockerfile +++ b/2.7/Dockerfile @@ -21,6 +21,8 @@ ENV PACKAGES="\ bash \ git \ ca-certificates \ + python2.7 \ + python2.7-dev \ libxml2-dev \ libxslt-dev \ " From 2ac9e45b94c388657406f2e37de95547a72a23db Mon Sep 17 00:00:00 2001 From: Zen Process Date: Wed, 1 Feb 2017 17:05:18 +0000 Subject: [PATCH 11/13] mhm2 --- 2.7/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/2.7/Dockerfile b/2.7/Dockerfile index bbb5ae3..7ec17d3 100644 --- a/2.7/Dockerfile +++ b/2.7/Dockerfile @@ -21,8 +21,9 @@ ENV PACKAGES="\ bash \ git \ ca-certificates \ - python2.7 \ - python2.7-dev \ + python2 \ + python2-dev \ + py-setuptools \ libxml2-dev \ libxslt-dev \ " From 2ccd3f69a0ab84e292a664238b024e158aed006d Mon Sep 17 00:00:00 2001 From: Zen Process Date: Thu, 2 Feb 2017 10:56:50 +0000 Subject: [PATCH 12/13] added BS and Selenium --- 2.7/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/2.7/Dockerfile b/2.7/Dockerfile index 7ec17d3..825d47b 100644 --- a/2.7/Dockerfile +++ b/2.7/Dockerfile @@ -60,6 +60,8 @@ RUN pip install lxml RUN pip install requests RUN pip install argparse RUN pip install xmljson +RUN pip install bs4 +RUN pip install selenium # since we will be "always" mounting the volume, we can set this up From cb8d01fa0e57250ecf1ad3e20584ea72fbf9e6b8 Mon Sep 17 00:00:00 2001 From: Zen Process Date: Sat, 4 Feb 2017 14:42:20 +0000 Subject: [PATCH 13/13] added nnltk install with pip --- 2.7/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/2.7/Dockerfile b/2.7/Dockerfile index 825d47b..b9614bd 100644 --- a/2.7/Dockerfile +++ b/2.7/Dockerfile @@ -62,6 +62,7 @@ RUN pip install argparse RUN pip install xmljson RUN pip install bs4 RUN pip install selenium +RUN pip install nltk # since we will be "always" mounting the volume, we can set this up