Skip to content

Commit

Permalink
updates to dockerfile
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexPatrie committed Jan 7, 2024
1 parent bc5c827 commit c644ba9
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 12 deletions.
32 changes: 22 additions & 10 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# TODO: Make this work for Smoldyn to be platform-agnostic

FROM python:3.10-bullseye
FROM ubuntu:22.04

# Implement the next two lines for use in Cloud
# RUN useradd -m simuser
Expand All @@ -12,19 +12,31 @@ WORKDIR /app
COPY . /app

RUN apt-get update && apt-get install -y \
build-essential \
wget \
libgl1-mesa-dev \
libglu1-mesa-dev \
# Add any other dependencies required by smoldyn
&& rm -rf /var/lib/apt/lists/*

RUN echo 'deb http://download.opensuse.org/repositories/home:/dilawar/Debian_11/ /' | tee /etc/apt/sources.list.d/home:dilawar.list
RUN curl -fsSL https://download.opensuse.org/repositories/home:dilawar/Debian_11/Release.key | gpg --dearmor | tee /etc/apt/trusted.gpg.d/home_dilawar.gpg > /dev/null
RUN apt update
RUN apt install smoldyn
# Download the smoldyn .deb package
RUN wget https://download.opensuse.org/repositories/home:/dilawar/xUbuntu_22.04/amd64/smoldyn_2.64.4-1+2.1_amd64.deb

# Install the downloaded package
RUN dpkg -i smoldyn_2.64.4-1+2.1_amd64.deb


# RUN apt-get update && apt-get install -y \
# build-essential \
# wget \
# libgl1-mesa-dev \
# libglu1-mesa-dev \
# # && rm -rf /var/lib/apt/lists/*

# RUN echo 'deb http://download.opensuse.org/repositories/home:/dilawar/Debian_11/ /' | tee /etc/apt/sources.list.d/home:dilawar.list
# RUN curl -fsSL https://download.opensuse.org/repositories/home:dilawar/Debian_11/Release.key | gpg --dearmor | tee /etc/apt/trusted.gpg.d/home_dilawar.gpg > /dev/null
# RUN apt update
# RUN apt install smoldyn

RUN pip install --upgrade pip \
&& pip install . ipython
# && pytest
&& pip install ipython \
&& pip install .

CMD ["ipython3"]
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ install the dependencies required for your use.

Most of the direct UI content for this tooling will be in the form of a jupyter notebook.

### Using `core_processes.smoldyn_process.SmoldynProcess()`:
### Using `biosimulator_processes.smoldyn_process.SmoldynProcess()`:

#### PLEASE NOTE:
Due to the multi-lingual nature of Smoldyn, which is primarily
Expand Down
5 changes: 4 additions & 1 deletion scripts/run-docker.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
#!/bin/bash
docker build -t biosimulator-processes . && docker run -it biosimulator-processes
docker buildx create --name biosimbuilder --use
docker buildx inspect --bootstrap
docker buildx build --platform linux/amd64 -t biosimulator-processes . \
&& docker run biosimulator-processes

0 comments on commit c644ba9

Please sign in to comment.