diff --git a/docker/python-sci/Dockerfile b/docker/python-sci/Dockerfile index d00143d..5082136 100644 --- a/docker/python-sci/Dockerfile +++ b/docker/python-sci/Dockerfile @@ -12,22 +12,28 @@ ENV LANG en_US.UTF-8 ENV LANGUAGE en_US.UTF-8 # Install dependencies (and force Python 3.11 update) -RUN conda config --add channels conda-forge && \ - conda install -y python=3.11 && \ +RUN conda config --set solver classic && \ + conda config --add channels conda-forge && \ + conda config --remove channels defaults && \ + conda config --set channel_priority strict && \ + conda install -y python=3.12.1 && \ conda install -y \ pika==1.3.1 \ python-dateutil==2.8.2 \ - pint==0.21 \ - numpy==1.24.3 \ - netcdf4==1.6.3 \ - h5netcdf==1.1.0 \ - pygrib \ - awscli==1.27.161 \ - jsonschema==4.19.0 \ - s5cmd==2.2.2 \ + pint==0.23 \ + numpy==1.26.4 \ + netcdf4==1.6.5 \ + h5netcdf==1.3.0 \ + pygrib==2.1.5 \ + awscli==1.32.41 \ + jsonschema==4.21.1 \ + s5cmd \ geojson==3.1.0 \ shapely==2.0.2 \ - pillow==10.0.1 \ + pillow==10.2.0 \ + flask==2.3.2 \ + #gunicorn=21.0.1 \ + gunicorn \ && conda clean -y --all # Get the latest package updates to keep security vulnerabilities down diff --git a/docker/python/Dockerfile b/docker/python/Dockerfile index 7e7e7f8..8db2755 100644 --- a/docker/python/Dockerfile +++ b/docker/python/Dockerfile @@ -1,18 +1,20 @@ # alpine:3.18.6 includes python 3.11.6 -FROM alpine:3.18.6 +#FROM alpine:3.18.6 # reduce python printing to stdout on build -ENV PYTHONBUFFERED=1 - -RUN echo "Installing python" && \ - apk add --update --no-cache python3 && \ - if [ ! -e /usr/bin/python ]; then ln -sf python3 /usr/bin/python ; fi && \ - \ - echo "Installing pip" && \ - python3 -m ensurepip && \ - rm -r /usr/lib/python*/ensurepip && \ - pip3 install --no-cache --upgrade pip setuptools wheel && \ - if [ ! -e /usr/bin/pip ]; then ln -s pip3 /usr/bin/pip ; fi +#ENV PYTHONBUFFERED=1 + +#RUN echo "Installing python" && \ +# apk add --update --no-cache python3 && \ +# if [ ! -e /usr/bin/python ]; then ln -sf python3 /usr/bin/python ; fi && \ +# \ +# echo "Installing pip" && \ +# python3 -m ensurepip && \ +# rm -r /usr/lib/python*/ensurepip && \ +# pip3 install --no-cache --upgrade pip setuptools wheel && \ +# if [ ! -e /usr/bin/pip ]; then ln -s pip3 /usr/bin/pip ; fi + +FROM python:3.12.2-alpine # install additional packages base packages common among all microservices RUN pip3 install --no-cache \