diff --git a/core/python2Action/CHANGELOG.md b/core/python2Action/CHANGELOG.md index 6dfd54c46f88f6805b66e191e8bdb119b2e327d5..02f594941925dbeb2d6f0ca3834e1b33d9593e71 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 32e9446fdd2a741877b9b54aea7110d548ccb3df..dd374f685d384a19cfceb5af61e5317ba0c6c2ae 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 1d802a761e8af5b26a2812174bdb4ba8d5c4e8ce..9f954636bb42a6a6602ad6065b210f0bc7bcacf7 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 979734593802bd6f1ec2fb590f9cdf5aace1203a..1f4873b9b68b554b533bb8c76bb6d5914738cc61 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 40e9f40a0ade3a088c757afd454acb9750da90c3..0000000000000000000000000000000000000000 --- 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 711fdf35e010858f097bf45b42390331587d9105..ecc40e38de886c943e72bd12d9c678b716421b08 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 = """