diff --git a/configs/docker/build/Dockerfile b/configs/docker/build/Dockerfile index 73c64868c5889bea3b254da2094703234850205b..eca107ed5ad3bb2e68dd1a00081f41d29d8b0e28 100644 --- a/configs/docker/build/Dockerfile +++ b/configs/docker/build/Dockerfile @@ -1,10 +1,13 @@ # syntax=docker/dockerfile:1 -FROM ubuntu:24.04 as base_image +FROM ubuntu:24.04 SHELL ["/bin/bash", "-c"] #install system packages -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 apt-get update; +RUN apt-get install --assume-yes software-properties-common; +RUN add-apt-repository ppa:deadsnakes/ppa; +RUN 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" diff --git a/tests/integration/partial/run_test_suite.sh b/tests/integration/partial/run_test_suite.sh index e4c8546a437eaf11a1278bb0258e01a9234e5fbd..c360b60256a76eaa50d8ef7ab404ad500598b8d6 100755 --- a/tests/integration/partial/run_test_suite.sh +++ b/tests/integration/partial/run_test_suite.sh @@ -3,12 +3,11 @@ # software installed. it writes files to a unix tmp dir and is not intended to be used for diagnostic testing, just # checking the installation is working -source /storage/app/miniconda3/bin/activate /storage/app/EWS_prod/envs/conda/py3EWS/ +source /storage/app/EWS_prod/envs/venv/ews_prod/bin/activate # assumes run from the tests/integration/partial dir, and that all necessary packages are checked out alongside PACKAGES_DIR="../../../../" -flagdir=$PACKAGES_DIR/flagdir epimodel=$PACKAGES_DIR/epimodel advisory=$PACKAGES_DIR/advisory_builder met_processing=$PACKAGES_DIR/met_extractor_v2 @@ -19,7 +18,7 @@ source_gen=$PACKAGES_DIR/source_gen coordinator=$PACKAGES_DIR/coordinator/coordinator coordinator_tests=$PACKAGES_DIR/coordinator/tests -export PYTHONPATH=$PYTHONPATH:$flagdir:$epimodel:$advisory:$met_processing:$met_processor:$plotting:$source_gen:$post_processing:$coordinator:$coordinator_tests +export PYTHONPATH=$PYTHONPATH:$epimodel:$advisory:$met_processing:$met_processor:$plotting:$source_gen:$post_processing:$coordinator:$coordinator_tests echo $PYTHONPATH