Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
openwhisk-runtime-python
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Groundhog
openwhisk-runtime-python
Commits
f94996a8
Commit
f94996a8
authored
8 years ago
by
Rodric Rabbah
Browse files
Options
Downloads
Patches
Plain Diff
Rebase docker image to ubuntu 14.04 and tweak docker runs.
Bump docker timeout to 420 seconds.
parent
6e5aee9b
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
core/pythonAction/Dockerfile
+11
-12
11 additions, 12 deletions
core/pythonAction/Dockerfile
docker.gradle
+1
-1
1 addition, 1 deletion
docker.gradle
tests/src/system/basic/CLIPythonTests.scala
+0
-1
0 additions, 1 deletion
tests/src/system/basic/CLIPythonTests.scala
with
12 additions
and
14 deletions
core/pythonAction/Dockerfile
+
11
−
12
View file @
f94996a8
# 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
...
...
This diff is collapsed.
Click to expand it.
docker.gradle
+
1
−
1
View file @
f94996a8
...
...
@@ -19,7 +19,7 @@
ext
{
dockerRegistry
=
project
.
hasProperty
(
'dockerRegistry'
)
?
dockerRegistry
+
'/'
:
''
dockerImageTag
=
project
.
hasProperty
(
'dockerImageTag'
)
?
dockerImageTag
:
'latest'
dockerTimeout
=
project
.
hasProperty
(
'dockerTimeout'
)
?
dockerTimeout
.
toInteger
()
:
2
40
dockerTimeout
=
project
.
hasProperty
(
'dockerTimeout'
)
?
dockerTimeout
.
toInteger
()
:
4
2
0
dockerRetries
=
project
.
hasProperty
(
'dockerRetries'
)
?
dockerRetries
.
toInteger
()
:
3
dockerBinary
=
project
.
hasProperty
(
'dockerBinary'
)
?
[
dockerBinary
]
:
[
'docker'
]
}
...
...
This diff is collapsed.
Click to expand it.
tests/src/system/basic/CLIPythonTests.scala
+
0
−
1
View file @
f94996a8
...
...
@@ -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
)
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment