You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@openwhisk.apache.org by GitBox <gi...@apache.org> on 2018/10/05 19:53:36 UTC
[GitHub] dubee closed pull request #41: update python packages to be in sync
with dockerskeleton
dubee closed pull request #41: update python packages to be in sync with dockerskeleton
URL: https://github.com/apache/incubator-openwhisk-runtime-python/pull/41
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
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 @@ RUN apk add --no-cache \
# 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 @@ RUN apk add --no-cache \
# 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"]
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services