diff --git a/configs/docker/build/Dockerfile b/configs/docker/build/Dockerfile index 39d9b28da32047e30f572e5211c93a5f417aa73d..73c64868c5889bea3b254da2094703234850205b 100644 --- a/configs/docker/build/Dockerfile +++ b/configs/docker/build/Dockerfile @@ -4,7 +4,7 @@ FROM ubuntu:24.04 as base_image SHELL ["/bin/bash", "-c"] #install system packages -RUN apt-get update;apt-get install --assume-yes python-dev-is-python3 python3-dev python3.11-venv wget unzip emacs gdal-bin libgdal-dev build-essential gfortran zlib1g zlib1g-dev libbz2-dev apt-utils liblzma-dev libcurl4-openssl-dev default-jre openssh-server libfribidi-dev libfontconfig1-dev libspatialindex-dev git dos2unix nano rsync; +RUN apt-get update;apt-get install --assume-yes python3.11 python3.11-venv wget unzip emacs gdal-bin libgdal-dev build-essential gfortran zlib1g zlib1g-dev libbz2-dev apt-utils liblzma-dev libcurl4-openssl-dev default-jre openssh-server libfribidi-dev libfontconfig1-dev libspatialindex-dev git dos2unix nano rsync; RUN echo "alias e='emacs -nw $1'" >> ~/.bashrc; RUN alias ll="ls -ltr" @@ -28,20 +28,13 @@ RUN chown -R $UNAME /storage #swith to the user before installing stuff USER $UNAME - -#create dirs WORKDIR /home -#RUN mkdir /home/ewsmanager/code #copy resources in -#COPY ./conda-env-py3EWS-nobuilds.yml . COPY ./requirements.txt . -RUN echo "alias e='emacs -nw $1'" >> ~/.bashrc; -RUN alias ll="ls -ltr" - #build the venv -RUN python3 -m venv /storage/app/EWS_prod/envs/venv/ews_prod +RUN python3.11 -m venv /storage/app/EWS_prod/envs/venv/ews_prod RUN source /storage/app/EWS_prod/envs/venv/ews_prod/bin/activate;pip install -r requirements.txt RUN echo $PYTHONPATH diff --git a/configs/docker/build/build.sh b/configs/docker/build/build.sh index a9ecb85cf0bcb9b1dce0441a64de425469ad8a9d..ecd352175b35e7a87cd8616d4f248f8155fd546e 100644 --- a/configs/docker/build/build.sh +++ b/configs/docker/build/build.sh @@ -1,4 +1,3 @@ -cp ../../conda/conda-env-py3EWS-nobuilds.yml .; # note that if you want to build an image that runs with your credentials, override the following variables when # building the image, e.g. for user 'lb584' with GID and UID 1001: # sudo docker build -t ews_coordinator --build-arg GNAME=lb584 --build-arg UNAME=lb584 @@ -7,4 +6,3 @@ cp ../../conda/conda-env-py3EWS-nobuilds.yml .; # that are mounted. If the default command is run, the user credentials are set to be those of the Cam group server sudo docker build -t ews_coordinator -f Dockerfile .; -rm -v conda-env-py3EWS-nobuilds.yml; diff --git a/configs/docker/build/requirements.txt b/configs/docker/build/requirements.txt index 17a36bcc8ca1237a555bacbf7d2a241b91d802de..53515092414e7016f02afce415059575be54e81e 100644 --- a/configs/docker/build/requirements.txt +++ b/configs/docker/build/requirements.txt @@ -9,3 +9,4 @@ HTMLTestRunner-rv==1.1.2 python-docx==1.1.0 rioxarray==0.15.0 Rtree==1.1.0 +scikit-learn==1.4.0 \ No newline at end of file