This is an automated email from the ASF dual-hosted git repository.
lukeroy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwhisk-runtime-docker.git
The following commit(s) were added to refs/heads/master by this push:
new 7b00606 Update python base image (#100)
7b00606 is described below
commit 7b00606d0a5f4c327e92d45b8bbd1a8eac704646
Author: Luke-Roy-IBM <[email protected]>
AuthorDate: Fri Mar 10 12:11:33 2023 +0100
Update python base image (#100)
* Update python base image
* Updated Python packages and sdk image
* Update bad action
---
core/CHANGELOG.md | 4 ++++
core/actionProxy/Dockerfile | 9 +++++----
sdk/docker/Dockerfile | 4 +++-
tests/dat/blackbox/badaction/Dockerfile | 4 +++-
4 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/core/CHANGELOG.md b/core/CHANGELOG.md
index f9549d5..8362802 100644
--- a/core/CHANGELOG.md
+++ b/core/CHANGELOG.md
@@ -19,6 +19,10 @@
# Apache OpenWhisk Docker Runtime Container
+## 1.15.0
+ - Update base python image to `python:3.11-alpine`
+ - Update python dependacies
+
## 1.14.0
- Support for __OW_ACTION_VERSION (openwhisk/4761)
diff --git a/core/actionProxy/Dockerfile b/core/actionProxy/Dockerfile
index ef194fa..1090b4f 100644
--- a/core/actionProxy/Dockerfile
+++ b/core/actionProxy/Dockerfile
@@ -16,16 +16,15 @@
#
# Dockerfile for docker skeleton (useful for running blackbox binaries,
scripts, or Python 3 actions) .
-FROM python:3.6-alpine
+FROM python:3.11-alpine
# Upgrade and install basic Python dependencies.
-# Use quick greenlet==1.1.3.post0 as update version is not compatible with
action Proxy
RUN apk upgrade --update \
&& apk add --no-cache bash perl jq zip git curl wget openssl ca-certificates
sed openssh-client \
&& update-ca-certificates \
&& apk add --no-cache --virtual .build-deps bzip2-dev g++ libc-dev \
&& pip install --upgrade pip setuptools six \
- && pip install --no-cache-dir gevent==1.3.6 flask==1.0.2
greenlet==1.1.3.post0\
+ && pip install --no-cache-dir gevent==22.10.2 flask==2.2.3 greenlet==2.0.2\
&& apk del .build-deps
ENV FLASK_PROXY_PORT 8080
@@ -40,4 +39,6 @@ RUN mkdir -p /action
ADD stub.sh /action/exec
RUN chmod +x /action/exec
-CMD ["/bin/bash", "-c", "cd actionProxy && python -u actionproxy.py"]
+WORKDIR /actionProxy
+
+CMD ["python", "-u", "actionproxy.py"]
diff --git a/sdk/docker/Dockerfile b/sdk/docker/Dockerfile
index e399fd8..dca6787 100644
--- a/sdk/docker/Dockerfile
+++ b/sdk/docker/Dockerfile
@@ -31,4 +31,6 @@ RUN apk add --no-cache --virtual .build-deps \
&& cd /action; gcc -o exec example.c \
&& apk del .build-deps
-CMD ["/bin/bash", "-c", "cd actionProxy && python -u actionproxy.py"]
+WORKDIR /actionProxy
+
+CMD ["python", "-u", "actionproxy.py"]
\ No newline at end of file
diff --git a/tests/dat/blackbox/badaction/Dockerfile
b/tests/dat/blackbox/badaction/Dockerfile
index 4c56590..31bbabc 100644
--- a/tests/dat/blackbox/badaction/Dockerfile
+++ b/tests/dat/blackbox/badaction/Dockerfile
@@ -22,4 +22,6 @@ ENV FLASK_PROXY_PORT 8080
ADD runner.py /actionProxy/
-CMD ["/bin/bash", "-c", "cd actionProxy && python -u runner.py"]
+WORKDIR /actionProxy
+
+CMD ["python", "-u", "runner.py"]
\ No newline at end of file
