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
FROM ubuntu
FROM ubuntu:14.04
ENV DEBIAN_FRONTEND noninteractive
# Upgrade and install python
RUN apt-get -y purge
RUN apt-get -y update
RUN apt-get -y install --fix-missing python2.7
RUN apt-get -y install --fix-missing python2.7-dev
RUN apt-get clean
# Install Python CGI helpers.
RUN apt-get -y install --fix-missing python-distribute python-pip
RUN pip install -U flask
RUN pip install -U gevent
# Upgrade and install Python and helpers
RUN apt-get -y purge && \
apt-get -y update && \
apt-get -y install --fix-missing python2.7 && \
apt-get -y install --fix-missing python2.7-dev && \
apt-get -y install --fix-missing python-distribute && \
apt-get -y install --fix-missing python-pip && \
apt-get clean && \
pip install -U flask && \
pip install -U gevent
ENV FLASK_PROXY_PORT 8080
......
......@@ -19,7 +19,7 @@
ext {
dockerRegistry = project.hasProperty('dockerRegistry') ? dockerRegistry + '/' : ''
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
dockerBinary = project.hasProperty('dockerBinary') ? [dockerBinary] : ['docker']
}
......
......@@ -49,7 +49,6 @@ class CLIPythonTests
implicit val wskprops = WskProps()
val wsk = new Wsk()
behavior of "Native Python Action"
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