diff --git a/configs/docker/build/Dockerfile b/configs/docker/build/Dockerfile index 2062f60b4b5b4cd48114c586e118e72c7ee5879f..336479e97fa6d7eb36ccccb0b0e6b8a6f3ba48d7 100644 --- a/configs/docker/build/Dockerfile +++ b/configs/docker/build/Dockerfile @@ -1,5 +1,7 @@ # syntax=docker/dockerfile:1 -FROM ubuntu:18.04 as base_image +FROM ubuntu:24.04 as base_image + +SHELL ["/bin/bash", "-c"] #run mkdir as root RUN mkdir -p /storage/app/EWS_prod/regions/EastAfrica/workspace @@ -10,10 +12,11 @@ WORKDIR /home #RUN mkdir /home/ewsmanager/code #copy resources in -COPY ./conda-env-py3EWS-nobuilds.yml . +#COPY ./conda-env-py3EWS-nobuilds.yml . +COPY ./requirements.txt . #install system packages -RUN apt-get update;apt-get install --assume-yes wget unzip emacs gdal-bin libgdal-dev build-essential gfortran zlib1g zlib1g-dev libbz2-dev apt-utils liblzma-dev libpcre++-dev libcurl4-openssl-dev default-jre lib32readline7 lib32readline6-dev openssh-server libfribidi-dev libfontconfig1-dev libspatialindex-dev git; +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; RUN echo "alias e='emacs -nw $1'" >> ~/.bashrc; RUN alias ll="ls -ltr" @@ -21,18 +24,21 @@ RUN alias ll="ls -ltr" RUN DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get -y install tzdata # Install miniconda -ENV CONDA_DIR /storage/app/miniconda3 -RUN wget --quiet https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh -O ~/miniconda.sh \ - && /bin/bash ~/miniconda.sh -b -p $CONDA_DIR \ - && rm -v ~/miniconda.sh; +#ENV CONDA_DIR /storage/app/miniconda3 +#RUN wget --quiet https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh -O ~/miniconda.sh \ +# && /bin/bash ~/miniconda.sh -b -p $CONDA_DIR \ +# && rm -v ~/miniconda.sh; # Put conda in path so we can use conda activate -ENV PATH=$CONDA_DIR/bin:$PATH +#ENV PATH=$CONDA_DIR/bin:$PATH #build the conda env(s) -RUN conda env create --file conda-env-py3EWS-nobuilds.yml --prefix /storage/app/EWS_prod/envs/conda/py3EWS +#RUN conda env create --file conda-env-py3EWS-nobuilds.yml --prefix /storage/app/EWS_prod/envs/conda/py3EWS +RUN python3 -m venv ews_prod +RUN source ews_prod/bin/activate;pip install -r requirements.txt #tidy -RUN rm -v conda-env-py3EWS-nobuilds.yml; +#RUN rm -v conda-env-py3EWS-nobuilds.yml; +#RUN rm -v requirements.txt; #these usernames and ids match the production server (IaaS), override when building a local image if needed ARG GNAME=ews diff --git a/configs/docker/run/launchDockerRunner_lb584_Local.sh b/configs/docker/run/launchDockerRunner_lb584_Local.sh index 60017f6444e45b395191ab54bf45f0b7b8d9dad8..f84542bd822d51738c5c02ae799877b17b47c07a 100755 --- a/configs/docker/run/launchDockerRunner_lb584_Local.sh +++ b/configs/docker/run/launchDockerRunner_lb584_Local.sh @@ -1,9 +1,9 @@ #!/bin/bash set -e -docker run -it -v "/media/scratch/lb584_scratch/projects/ews_aws/ews_3/code:/storage/app/EWS_prod/code" \ - -v "/media/scratch/lb584_scratch/projects/ews_aws/ews_3/regions:/storage/app/EWS_prod/regions" \ - -v "/media/scratch/lb584_scratch/projects/ews_aws/ews_3/envs/credentials:/storage/app/EWS_prod/envs/credentials" \ +docker run -it -v "/media/scratch/lb584_scratch/projects/ews_instructions/code:/storage/app/EWS_prod/code" \ + -v "/media/scratch/lb584_scratch/projects/ews_instructionsregions:/storage/app/EWS_prod/regions" \ + -v "/media/scratch/lb584_scratch/projects/ews_instructions/envs/credentials:/storage/app/EWS_prod/envs/credentials" \ -w "/storage/app/EWS_prod/code" \ --name ews_runner \ ews_coordinator