Docker adaptation for windows (#317)

Docker adaptation for windows, new su2 installation

Author: GBenedett

.github/workflows/integrationtests.yml

@@ -62,17 +62,20 @@ jobs:
 
     - name: Install SU2
       shell: bash -l {0}
-      run: installation/Ubuntu/install_su2.sh
+      run: installation/Ubuntu/install_su2_without_mpi.sh
 
     - name: Install Pentagrow
       shell: bash -l {0}
       run: installation/Ubuntu/install_pentagrow.sh
-        
+
+    - name: Add src to PYTHONPATH
+      run: echo "PYTHONPATH=$PYTHONPATH:$(pwd)/src" >> $GITHUB_ENV
+
     - name: Run integration tests
       shell: bash -l {0}
       run: |
         source ~/.bashrc
-        pytest -v ./tests --cov=ceasiompy/ --cov-report xml:coverage.xml -m "not gui"
+        pytest -v ./tests --cov=ceasiompy --cov-report xml:coverage.xml -m "not gui"
 
     - name: Upload coverage to Codecov
       uses: codecov/codecov-action@v3.1.0

.github/workflows/unittests.yml

@@ -56,9 +56,13 @@ jobs:
     - name: Install libGLU
       run: sudo apt-get install -y libglu1-mesa-dev
 
+    - name: Add src to PYTHONPATH
+      run: echo "PYTHONPATH=$PYTHONPATH:$(pwd)/src" >> $GITHUB_ENV
+
     - name: Run unit tests
       shell: bash -l {0}
-      run: pytest -v ./ceasiompy --cov=ceasiompy/ --cov-report xml:coverage.xml
+      run:
+        pytest -v src/ceasiompy --cov=ceasiompy --cov-report xml:coverage.xml
 
     - name: Upload coverage to Codecov
       uses: codecov/codecov-action@v3.1.0

.gitignore

@@ -185,4 +185,6 @@ aircraft_loads.csv
 /ceasiompy/Database/databases/ceasiompy.db
 
 ceasiompy.cfg
-ceasiompy.log
+ceasiompy.log
+history.csv
+docker

CEASIOMpy_docker_Installation

@@ -1,19 +1,23 @@
 # With this Dockerfile, you are building a Docker image for
-# your LOCAL CEASIOMpy on Ubuntu 22.04, with system dependencies and Miniconda.
+# your LOCAL CEASIOMpy on Ubuntu latest, with system dependencies and Miniconda.
 # Use the commands below to build the Docker image,
 # and then to run the Docker container.
 
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 
 RUN apt-get update
 
+RUN apt-get install -y libglu1-mesa-dev
+
+RUN apt update && apt upgrade -y
+
 # Install apt-utils
-RUN apt-get install -y apt-utils
+RUN apt-get install -y apt-utils 
 
 # Install system dependencies
 RUN apt-get install -y --no-install-recommends \
-    git curl wget sudo unzip build-essential libtbb2 libtbb-dev libxrender1 libxcursor1 libxinerama1 libxft2 libxt6 \
-    libgl1-mesa-glx libglu1-mesa libegl1-mesa libosmesa6 xvfb ca-certificates && \
+    git curl wget sudo unzip build-essential libtbbmalloc2 libtbb-dev libxrender1 libxcursor1 libxinerama1 libxft2 libxt6 \
+    libgl1 libglu1-mesa libegl1 libosmesa6 xvfb ca-certificates && \
     rm -rf /var/lib/apt/lists/*
 
 # Install Miniconda
@@ -23,20 +27,24 @@ RUN curl -fsSL https://github.com/conda-forge/miniforge/releases/latest/download
     rm /tmp/miniforge.sh
 ENV PATH=$CONDA_DIR/bin:$PATH
 
+RUN apt-get install -y
+
 # Create the necessary directory structure
 WORKDIR /CEASIOMpy/installation/Ubuntu/
 
-# Download only the required installation scripts
-RUN wget https://raw.githubusercontent.com/cfsengineering/CEASIOMpy/main/installation/Ubuntu/install_pyavl.sh && \
-    wget https://raw.githubusercontent.com/cfsengineering/CEASIOMpy/main/installation/Ubuntu/install_su2.sh && \
-    wget https://raw.githubusercontent.com/cfsengineering/CEASIOMpy/main/installation/Ubuntu/install_pentagrow.sh
+# Copy the required installation scripts from local context
+COPY ./installation/Ubuntu/install_pyavl.sh .
+COPY ./installation/Ubuntu/install_su2_with_mpi.sh .
+# COPY installation/Ubuntu/install_pentagrow.sh .
 
 # Make the scripts executable
 RUN chmod +x install_*.sh
 
+WORKDIR /CEASIOMpy
+
 # Run the installation scripts
-RUN ./install_pyavl.sh
-RUN ./install_su2.sh
+RUN installation/Ubuntu/install_pyavl.sh
+RUN installation/Ubuntu/install_su2_with_mpi.sh
 
 # Go from /CEASIOMpy/INSTALLDIR to /INSTALLDIR
 RUN mkdir -p /INSTALLDIR && \
@@ -45,19 +53,15 @@ RUN mkdir -p /INSTALLDIR && \
 
 # Install xvfb and other graphical display dependencies for Ubuntu
 RUN apt-get update && apt-get install -y --no-install-recommends \
-    xvfb libgl1-mesa-glx libglu1-mesa libegl1-mesa libosmesa6 libxt6 && \
+    xvfb libgl1 libglu1-mesa libegl1 libosmesa6 libxt6 && \
     rm -rf /var/lib/apt/lists/*
 
 # Install system dependencies
 RUN apt-get update && apt-get install -y --no-install-recommends \
-    g++ libtbb2 libtbb-dev libxrender1 libxcursor1 libxinerama1 libxft2 libxt6 \
-    libgl1-mesa-glx libglu1-mesa libegl1-mesa libosmesa6 xvfb && \
+    g++ libtbbmalloc2 libtbb-dev libxrender1 libxcursor1 libxinerama1 libxft2 libxt6 \
+    libglu1-mesa libosmesa6 xvfb && \
     rm -rf /var/lib/apt/lists/*
 
-# Disable Streamlit watchdog and use polling
-#ENV STREAMLIT_GLOBAL_DISABLE_WATCHDOG=1
-#ENV WATCHDOG_USE_POLLER=1
-
 # Set the DISPLAY environment variable
 ENV DISPLAY=:99
 ENV LIBGL_ALWAYS_SOFTWARE=1
@@ -77,7 +81,7 @@ RUN mkdir -p /CEASIOMpy
 WORKDIR /CEASIOMpy
 
 # Add software paths to the PATH environment variable
-ENV PATH="/CEASIOMpy/INSTALLDIR/SU2-v8.1.0-linux64-mpi/bin:/CEASIOMpy/INSTALLDIR/avl:$PATH"
+ENV PATH="/CEASIOMpy/INSTALLDIR/bin:/CEASIOMpy/INSTALLDIR/avl:$PATH"
 
 # Get the required files for installing the conda environment
 RUN wget https://raw.githubusercontent.com/cfsengineering/CEASIOMpy/main/setup.py -O /CEASIOMpy/setup.py && \
@@ -94,16 +98,14 @@ COPY src /CEASIOMpy/src
 # Create the Conda environment from the environment.yml file
 RUN /bin/bash -c "source $CONDA_DIR/etc/profile.d/conda.sh && conda env create -f environment.yml"
 
-# Activate the Conda environment and install CEASIOMpy
-RUN /bin/bash -c "source $CONDA_DIR/etc/profile.d/conda.sh && conda activate ceasiompy && pip install -e ."
-
 # Automatically activate the Conda environment in new shells
 RUN echo "source $CONDA_DIR/etc/profile.d/conda.sh" >> ~/.bashrc && \
     echo "conda activate ceasiompy" >> ~/.bashrc && \
-    echo "python src/bin/ceasiompy_run --gui" >> ~/.bashrc
+    echo "pip install -e ." >> ~/.bashrc && \
+    echo "ceasiompy_run --gui" >> ~/.bashrc
 
 # Move the content of /INSTALLDIR to the mounted /CEASIOMpy/INSTALLDIR folder at runtime
-CMD ["/bin/bash", "-c", "rm -rf /CEASIOMpy/INSTALLDIR && mkdir -p /CEASIOMpy/INSTALLDIR && mv /INSTALLDIR/* /CEASIOMpy/INSTALLDIR/ && exec bash"]
+# CMD ["/bin/bash", "-c", "rm -rf /CEASIOMpy/INSTALLDIR && mkdir -p /CEASIOMpy/INSTALLDIR && mv /INSTALLDIR/* /CEASIOMpy/INSTALLDIR/ && exec bash"]
 
 # Now you just need click on: Networ URL