Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/acousticDE.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,4 @@ jobs:

- name: Build Docker Image
run: |
docker build -f de_method/Dockerfile . --platform=linux/amd64 -t de-method-test:latest
docker build -f de_method/Dockerfile . -t de-method-test:latest
7 changes: 7 additions & 0 deletions de_method/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,15 @@ RUN apt-get update && apt-get install -y \
git \
build-essential \
gmsh \
libgmsh-dev \
python3-gmsh \
&& rm -rf /var/lib/apt/lists/*

# Make system python3-gmsh available to the pip environment
# This creates a symlink so pip-installed packages can import gmsh
RUN SITE_PACKAGES=$(python -c "import site; print(site.getsitepackages()[0])") && \
ln -sf /usr/lib/python3/dist-packages/gmsh* "$SITE_PACKAGES/"
Comment thread
mberz marked this conversation as resolved.

# Copy method package directory
COPY de_method /app/de_method

Expand Down
19 changes: 13 additions & 6 deletions pyroomacoustics_method/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,16 +1,23 @@
# Use Python 3.11 as base image to match the main backend
FROM python:3.11.13-slim

# Set working directory
WORKDIR /app
# Use Python 3.11 slim image for smaller size
FROM python:3.11-slim
Comment on lines +1 to +2

# Install system dependencies for mesh generation and scientific computing
RUN apt-get update && apt-get install -y \
git \
build-essential \
gmsh \
libgmsh-dev \
python3-gmsh \
&& rm -rf /var/lib/apt/lists/*

# Make system python3-gmsh available to the pip environment
# This creates a symlink so pip-installed packages can import gmsh
RUN SITE_PACKAGES=$(python -c "import site; print(site.getsitepackages()[0])") && \
ln -sf /usr/lib/python3/dist-packages/gmsh* "$SITE_PACKAGES/"
Comment thread
mberz marked this conversation as resolved.

# Set working directory
WORKDIR /app

# Copy method package
COPY pyroomacoustics_method /app/pyroomacoustics_method

Expand All @@ -19,5 +26,5 @@ RUN pip install --no-cache-dir /app/pyroomacoustics_method

WORKDIR /app/pyroomacoustics_method

# Default command to run the containerized DE method
# Call pyroomacoustics cli when the container starts
CMD ["python", "-m", "pyroomacoustics_interface"]
2 changes: 1 addition & 1 deletion pyroomacoustics_method/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ classifiers = [
]
dependencies = [
"numpy>=1.23.0",
"gmsh",
"pyroomacoustics>=0.8.0",
"requests",
"pyfar>=0.8.0",
Comment on lines 28 to 32
Expand All @@ -50,6 +49,7 @@ tests = [
"watchdog",
"ruff",
"coverage",
"gmsh",
]

docs = [
Expand Down
Loading