From 2ee0fe7f17b3f6f6834afe59e08ec18c9f68f2c3 Mon Sep 17 00:00:00 2001 From: RayPlante Date: Sat, 22 Jun 2024 15:38:06 -0400 Subject: [PATCH] python 3.10: build uwsgi python plugin for 3.10 --- docker/ejsonschema/Dockerfile | 18 +++++++++--------- docker/pymongo/Dockerfile | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/docker/ejsonschema/Dockerfile b/docker/ejsonschema/Dockerfile index d82179b..1af09a7 100644 --- a/docker/ejsonschema/Dockerfile +++ b/docker/ejsonschema/Dockerfile @@ -2,12 +2,12 @@ FROM oar-metadata/jqfromsrc:latest RUN apt-get update && apt-get install -y unzip uwsgi uwsgi-src \ uuid-dev libcap-dev libpcre3-dev python3-distutils -RUN PYTHON=python3.8 uwsgi --build-plugin "/usr/src/uwsgi/plugins/python python38" && \ - mv python38_plugin.so /usr/lib/uwsgi/plugins/python38_plugin.so && \ - chmod 644 /usr/lib/uwsgi/plugins/python38_plugin.so +RUN PYTHON=python3 uwsgi --build-plugin "/usr/src/uwsgi/plugins/python python3" && \ + mv python3_plugin.so /usr/lib/uwsgi/plugins/python3_plugin.so && \ + chmod 644 /usr/lib/uwsgi/plugins/python3_plugin.so -RUN update-alternatives --install /usr/lib/uwsgi/plugins/python3_plugin.so \ - python_plugin.so /usr/lib/uwsgi/plugins/python38_plugin.so 1 +RUN update-alternatives --install /usr/lib/uwsgi/plugins/python_plugin.so \ + python_plugin.so /usr/lib/uwsgi/plugins/python3_plugin.so 1 RUN python -m pip install "setuptools<66.0.0" RUN python -m pip install json-spec jsonschema==2.4.0 requests \ @@ -17,16 +17,16 @@ RUN python -m pip install --no-dependencies jsonmerge==1.3.0 WORKDIR /root RUN curl -L -o ejsonschema.zip \ - https://github.com/usnistgov/ejsonschema/archive/master.zip && \ + https://github.com/usnistgov/ejsonschema/archive/1.0rc4.zip && \ unzip ejsonschema.zip && \ - cd ejsonschema-master && \ - python setup.py install --install-purelib=/usr/local/lib/python3.8/dist-packages + cd ejsonschema-1.0rc4 && \ + python setup.py install --install-purelib=/usr/local/lib/python3.10/dist-packages RUN curl -L -o pynoid.zip \ https://github.com/RayPlante/pynoid/archive/master.zip && \ unzip pynoid.zip && \ cd pynoid-master && \ - python setup.py install --install-purelib=/usr/local/lib/python3.8/dist-packages + python setup.py install --install-purelib=/usr/local/lib/python3.10/dist-packages CMD ["bash"] diff --git a/docker/pymongo/Dockerfile b/docker/pymongo/Dockerfile index 85a4568..4809aab 100644 --- a/docker/pymongo/Dockerfile +++ b/docker/pymongo/Dockerfile @@ -1,4 +1,4 @@ -# This provides the base support for Python 3.8 and MongoDB 4.4 +# This provides the base support for Python 3.10 and MongoDB 7.0 FROM mongo:7.0-jammy # VOLUME /data