Skip to content

Commit 7b00606

Browse files
authored
Update python base image (#100)
* Update python base image * Updated Python packages and sdk image * Update bad action
1 parent ee7e622 commit 7b00606

4 files changed

Lines changed: 15 additions & 6 deletions

File tree

core/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@
1919

2020
# Apache OpenWhisk Docker Runtime Container
2121

22+
## 1.15.0
23+
- Update base python image to `python:3.11-alpine`
24+
- Update python dependacies
25+
2226
## 1.14.0
2327
- Support for __OW_ACTION_VERSION (openwhisk/4761)
2428

core/actionProxy/Dockerfile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,15 @@
1616
#
1717

1818
# Dockerfile for docker skeleton (useful for running blackbox binaries, scripts, or Python 3 actions) .
19-
FROM python:3.6-alpine
19+
FROM python:3.11-alpine
2020

2121
# Upgrade and install basic Python dependencies.
22-
# Use quick greenlet==1.1.3.post0 as update version is not compatible with action Proxy
2322
RUN apk upgrade --update \
2423
&& apk add --no-cache bash perl jq zip git curl wget openssl ca-certificates sed openssh-client \
2524
&& update-ca-certificates \
2625
&& apk add --no-cache --virtual .build-deps bzip2-dev g++ libc-dev \
2726
&& pip install --upgrade pip setuptools six \
28-
&& pip install --no-cache-dir gevent==1.3.6 flask==1.0.2 greenlet==1.1.3.post0\
27+
&& pip install --no-cache-dir gevent==22.10.2 flask==2.2.3 greenlet==2.0.2\
2928
&& apk del .build-deps
3029

3130
ENV FLASK_PROXY_PORT 8080
@@ -40,4 +39,6 @@ RUN mkdir -p /action
4039
ADD stub.sh /action/exec
4140
RUN chmod +x /action/exec
4241

43-
CMD ["/bin/bash", "-c", "cd actionProxy && python -u actionproxy.py"]
42+
WORKDIR /actionProxy
43+
44+
CMD ["python", "-u", "actionproxy.py"]

sdk/docker/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,6 @@ RUN apk add --no-cache --virtual .build-deps \
3131
&& cd /action; gcc -o exec example.c \
3232
&& apk del .build-deps
3333

34-
CMD ["/bin/bash", "-c", "cd actionProxy && python -u actionproxy.py"]
34+
WORKDIR /actionProxy
35+
36+
CMD ["python", "-u", "actionproxy.py"]

tests/dat/blackbox/badaction/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,6 @@ ENV FLASK_PROXY_PORT 8080
2222

2323
ADD runner.py /actionProxy/
2424

25-
CMD ["/bin/bash", "-c", "cd actionProxy && python -u runner.py"]
25+
WORKDIR /actionProxy
26+
27+
CMD ["python", "-u", "runner.py"]

0 commit comments

Comments
 (0)