Merge pull request #41 from csantanapr/update_base_dockeskeleton
update python packages to be in sync with dockerskeleton
diff --git a/core/python2Action/Dockerfile b/core/python2Action/Dockerfile
index d22fabe..570d3c9 100644
--- a/core/python2Action/Dockerfile
+++ b/core/python2Action/Dockerfile
@@ -34,25 +34,25 @@
# Install common modules for python
RUN pip install --no-cache-dir --upgrade pip setuptools six \
&& pip install --no-cache-dir \
- gevent==1.1.2 \
- flask==0.11.1 \
- beautifulsoup4==4.5.1 \
- httplib2==0.9.2 \
- kafka_python==1.3.1 \
- lxml==3.6.4 \
- python-dateutil==2.5.3 \
- requests==2.11.1 \
- scrapy==1.1.2 \
- simplejson==3.8.2 \
- virtualenv==15.1.0 \
- twisted==16.4.0
+ gevent==1.3.6 \
+ flask==1.0.2 \
+ beautifulsoup4==4.6.3 \
+ httplib2==0.11.3 \
+ kafka_python==1.4.3 \
+ lxml==4.2.5 \
+ python-dateutil==2.7.3 \
+ requests==2.19.1 \
+ scrapy==1.5.1 \
+ simplejson==3.16.0 \
+ virtualenv==16.0.0 \
+ twisted==18.7.0
ENV FLASK_PROXY_PORT 8080
# Add the action proxy
-ADD https://raw.githubusercontent.com/apache/incubator-openwhisk-runtime-docker/dockerskeleton%401.3.3/core/actionProxy/actionproxy.py /actionProxy/actionproxy.py
+ADD https://raw.githubusercontent.com/apache/incubator-openwhisk-runtime-docker/master/core/actionProxy/actionproxy.py /actionProxy/actionproxy.py
ADD pythonrunner.py /pythonAction/
-RUN rm -rf /action
+RUN mkdir -p /action
CMD ["/bin/bash", "-c", "cd pythonAction && python -u pythonrunner.py"]
diff --git a/core/pythonAction/Dockerfile b/core/pythonAction/Dockerfile
index 4ffe48a..dbe81e7 100644
--- a/core/pythonAction/Dockerfile
+++ b/core/pythonAction/Dockerfile
@@ -30,21 +30,22 @@
# Install common modules for python
RUN pip install \
- beautifulsoup4==4.5.3 \
- httplib2==0.10.3 \
- kafka_python==1.3.4 \
- lxml==3.7.3 \
- python-dateutil==2.6.0 \
- requests==2.13.0 \
- scrapy==1.3.3 \
- simplejson==3.10.0 \
- virtualenv==15.1.0 \
- twisted==17.1.0
+ beautifulsoup4==4.6.3 \
+ httplib2==0.11.3 \
+ kafka_python==1.4.3 \
+ lxml==4.2.5 \
+ python-dateutil==2.7.3 \
+ requests==2.19.1 \
+ scrapy==1.5.1 \
+ simplejson==3.16.0 \
+ virtualenv==16.0.0 \
+ twisted==18.7.0
ENV FLASK_PROXY_PORT 8080
RUN mkdir -p /pythonAction
ADD pythonrunner.py /pythonAction/
RUN rm -rf /action
+RUN mkdir /action
CMD ["/bin/bash", "-c", "cd pythonAction && python -u pythonrunner.py"]
