openwhisk-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dgr...@apache.org
Subject [incubator-openwhisk-runtime-python] 02/02: Update base images to openwhisk/dockerskeleton:1.3.1.
Date Fri, 06 Jul 2018 12:46:31 GMT
This is an automated email from the ASF dual-hosted git repository.

dgrove pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-runtime-python.git

commit de93403b5fa122982185c139a9b45f29c0cf5f87
Author: Rodric Rabbah <rodric@gmail.com>
AuthorDate: Thu Jul 5 20:21:45 2018 -0400

    Update base images to openwhisk/dockerskeleton:1.3.1.
---
 core/python2Action/CHANGELOG.md                                     | 6 ++++--
 core/python2Action/Dockerfile                                       | 2 +-
 core/pythonAction/CHANGELOG.md                                      | 6 ++++--
 core/pythonAction/Dockerfile                                        | 2 +-
 tests/.pydevproject                                                 | 5 -----
 .../scala/runtime/actionContainers/PythonActionContainerTests.scala | 5 +++++
 6 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/core/python2Action/CHANGELOG.md b/core/python2Action/CHANGELOG.md
index 6dfd54c..02f5949 100644
--- a/core/python2Action/CHANGELOG.md
+++ b/core/python2Action/CHANGELOG.md
@@ -19,10 +19,12 @@
 
 # Python 2 OpenWhisk Runtime Container
 
-
+## 1.0.1
+Changes:
+  - Update base image to openwhisk/dockerskeleton:1.3.1
 
 ## 1.0.0
-Change: Initial release
+Initial release.
 
 Python version = 2.7.12
 
diff --git a/core/python2Action/Dockerfile b/core/python2Action/Dockerfile
index 32e9446..dd374f6 100644
--- a/core/python2Action/Dockerfile
+++ b/core/python2Action/Dockerfile
@@ -50,7 +50,7 @@ RUN pip install --no-cache-dir --upgrade pip setuptools six \
 ENV FLASK_PROXY_PORT 8080
 
 # Add the action proxy
-ADD https://raw.githubusercontent.com/apache/incubator-openwhisk-runtime-docker/dockerskeleton%401.1.0/core/actionProxy/actionproxy.py
/actionProxy/actionproxy.py
+ADD https://raw.githubusercontent.com/apache/incubator-openwhisk-runtime-docker/dockerskeleton%401.3.1/core/actionProxy/actionproxy.py
/actionProxy/actionproxy.py
 
 ADD pythonrunner.py /pythonAction/
 
diff --git a/core/pythonAction/CHANGELOG.md b/core/pythonAction/CHANGELOG.md
index 1d802a7..9f95463 100644
--- a/core/pythonAction/CHANGELOG.md
+++ b/core/pythonAction/CHANGELOG.md
@@ -19,10 +19,12 @@
 
 # Python 3 OpenWhisk Runtime Container
 
-
+## 1.0.1
+Changes:
+  - Update base image to openwhisk/dockerskeleton:1.3.1
 
 ## 1.0.0
-Change: Initial release
+Initial release.
 
 Python version = 3.6.1
 
diff --git a/core/pythonAction/Dockerfile b/core/pythonAction/Dockerfile
index 9797345..1f4873b 100644
--- a/core/pythonAction/Dockerfile
+++ b/core/pythonAction/Dockerfile
@@ -16,7 +16,7 @@
 #
 
 # Dockerfile for python actions, overrides and extends ActionRunner from actionProxy
-FROM openwhisk/dockerskeleton:1.0.0
+FROM openwhisk/dockerskeleton:1.3.1
 
 RUN apk add --no-cache \
         bzip2-dev \
diff --git a/tests/.pydevproject b/tests/.pydevproject
deleted file mode 100644
index 40e9f40..0000000
--- a/tests/.pydevproject
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?eclipse-pydev version="1.0"?><pydev_project>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
-</pydev_project>
diff --git a/tests/src/test/scala/runtime/actionContainers/PythonActionContainerTests.scala
b/tests/src/test/scala/runtime/actionContainers/PythonActionContainerTests.scala
index 711fdf3..ecc40e3 100644
--- a/tests/src/test/scala/runtime/actionContainers/PythonActionContainerTests.scala
+++ b/tests/src/test/scala/runtime/actionContainers/PythonActionContainerTests.scala
@@ -103,6 +103,11 @@ class PythonActionContainerTests extends BasicActionRunnerTests with
WskActorSys
          """.stripMargin.trim)
   })
 
+  testInitCannotBeCalledMoreThanOnce("""
+        |def main(args):
+        |    return args
+      """.stripMargin)
+
   it should "support actions using non-default entry points" in {
     withActionContainer() { c =>
       val code = """


Mime
View raw message