Skip to content
Snippets Groups Projects
Commit f94996a8 authored by Rodric Rabbah's avatar Rodric Rabbah
Browse files

Rebase docker image to ubuntu 14.04 and tweak docker runs.

Bump docker timeout to 420 seconds.
parent 6e5aee9b
No related branches found
No related tags found
No related merge requests found
# Dockerfile for python action # Dockerfile for python action
FROM ubuntu FROM ubuntu:14.04
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive
# Upgrade and install python # Upgrade and install Python and helpers
RUN apt-get -y purge RUN apt-get -y purge && \
RUN apt-get -y update apt-get -y update && \
RUN apt-get -y install --fix-missing python2.7 apt-get -y install --fix-missing python2.7 && \
RUN apt-get -y install --fix-missing python2.7-dev apt-get -y install --fix-missing python2.7-dev && \
RUN apt-get clean apt-get -y install --fix-missing python-distribute && \
apt-get -y install --fix-missing python-pip && \
# Install Python CGI helpers. apt-get clean && \
RUN apt-get -y install --fix-missing python-distribute python-pip pip install -U flask && \
RUN pip install -U flask pip install -U gevent
RUN pip install -U gevent
ENV FLASK_PROXY_PORT 8080 ENV FLASK_PROXY_PORT 8080
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
ext { ext {
dockerRegistry = project.hasProperty('dockerRegistry') ? dockerRegistry + '/' : '' dockerRegistry = project.hasProperty('dockerRegistry') ? dockerRegistry + '/' : ''
dockerImageTag = project.hasProperty('dockerImageTag') ? dockerImageTag : 'latest' dockerImageTag = project.hasProperty('dockerImageTag') ? dockerImageTag : 'latest'
dockerTimeout = project.hasProperty('dockerTimeout') ? dockerTimeout.toInteger() : 240 dockerTimeout = project.hasProperty('dockerTimeout') ? dockerTimeout.toInteger() : 420
dockerRetries = project.hasProperty('dockerRetries') ? dockerRetries.toInteger() : 3 dockerRetries = project.hasProperty('dockerRetries') ? dockerRetries.toInteger() : 3
dockerBinary = project.hasProperty('dockerBinary') ? [dockerBinary] : ['docker'] dockerBinary = project.hasProperty('dockerBinary') ? [dockerBinary] : ['docker']
} }
......
...@@ -49,7 +49,6 @@ class CLIPythonTests ...@@ -49,7 +49,6 @@ class CLIPythonTests
implicit val wskprops = WskProps() implicit val wskprops = WskProps()
val wsk = new Wsk() val wsk = new Wsk()
behavior of "Native Python Action" behavior of "Native Python Action"
it should "invoke a blocking action and get the result" in withAssetCleaner(wskprops) { it should "invoke a blocking action and get the result" in withAssetCleaner(wskprops) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment