Skip to content

Commit cdb9882

Browse files
authored
Merge pull request #20 from BIOP/biop-desktop-011
Biop desktop 011
2 parents e424796 + e9dbc2b commit cdb9882

6 files changed

Lines changed: 85 additions & 1 deletion

File tree

docker/Dockerfile-ms

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ARG ALIAS=biop/
77
# base needs to be last, Don't Ask Wky ! (I don't know) ! and it seems it need to be named 'base' , D.A:W.2 ! but it works !
88
ARG QUPATH_VERSION=v0.5.1-01
99
ARG ILASTIK_VERSION=1.4.0-gpu
10-
ARG FIJI_VERSION=20240429
10+
ARG FIJI_VERSION=20240816
1111
ARG CELLPOSE_VERSION=2.2.2
1212
ARG DEVBIO_VERSION=0.10.1
1313
ARG SAMAPI_VERSION=0.4.0

docker/fiji/Dockerfile-fiji

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ RUN ${fiji} ${updateCommand} \
3737
"3D ImageJ Suite" "https://sites.imagej.net/Tboudier/" \
3838
"IJPB-plugins" "https://sites.imagej.net/IJPB-plugins/" \
3939
"ilastik" "https://sites.imagej.net/Ilastik/" \
40+
# "ImageScience" "https://sites.imagej.net/ImageScience/" \
4041
"CSBDeep" "https://sites.imagej.net/CSBDeep/" \
4142
"StarDist" "https://sites.imagej.net/StarDist/" \
4243
"OMERO 5.5-5.6" "https://sites.imagej.net/OMERO-5.5-5.6/" \
@@ -57,6 +58,22 @@ RUN wget -q -q https://www.dropbox.com/sh/dxofkiyseuxn4l4/AADrPjPBbJK_77Ai2WCfaO
5758
&& unzip -o Linux-2.2.0.16.zip -d /opt/Fiji.app/ -x / \
5859
&& rm Linux-2.2.0.16.zip \
5960
&& rm /opt/Fiji.app/plugins/clij2-fft_-2.2.0.15.jar
61+
62+
# Install some extratool for PhD Course
63+
# ThunderSTORM
64+
RUN wget -q https://github.com/zitmen/thunderstorm/releases/download/v1.3/Thunder_STORM.jar -O /opt/Fiji.app/plugins/Thunder_STORM.jar \
65+
&& chmod -R a+rwX /opt/Fiji.app/plugins
66+
67+
#ij2-LocalizeJ (depends from)
68+
RUN wget -q https://maven.scijava.org/service/local/repositories/central/content/colt/colt/1.2.0/colt-1.2.0.jar -O /opt/Fiji.app/jars/colt-1.2.0.jar \
69+
&& chmod -R a+rwX /opt/Fiji.app/jars
70+
71+
RUN wget -q "https://maven.scijava.org/service/local/artifact/maven/redirect?r=releases&g=sc.fiji&a=imagescience&v=3.0.0&e=jar" -O /opt/Fiji.app/jars/imagescience-3.0.0.jar \
72+
&& chmod -R a+rwX /opt/Fiji.app/jars
73+
74+
RUN wget -q https://github.com/ArneS70/ij2-LocalizeJ/raw/main/target/LocalizeJ-0.1.0-SNAPSHOT.jar -O /opt/Fiji.app/jars/LocalizeJ-0.1.0-SNAPSHOT.jar \
75+
&& chmod -R a+rwX /opt/Fiji.app/jars
76+
6077
## NOT WORKING
6178
# /opt/Fiji.app/ImageJ-linux64 --update update
6279
# [WARNING] Skipping plugins/clij2-fft_-2.2.0.15.jar

docker/openpiv/Dockerfile-openpiv

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
ARG BASE_IMAGE=0.1.0
2+
ARG ALIAS="biop/"
3+
FROM ${ALIAS}biop-vnc-base:${BASE_IMAGE}
4+
5+
USER root
6+
7+
##############################################################################
8+
# install devbio-napari
9+
COPY openpiv/env_openpiv.yml /tmp/env_openpiv.yml
10+
RUN conda env update -n openpiv -f /tmp/env_openpiv.yml \
11+
&& conda clean --all -f -y \
12+
&& conda env export -n "biop" \
13+
&& rm /tmp/env_openpiv.yml
14+
15+
#create shortcut to start devbio-napari
16+
COPY napari/napari-icon.ico /opt/devbio/napari-icon.ico
17+
COPY openpiv/start_devbio.sh /opt/devbio/start_devbio.sh
18+
RUN chmod +x /opt/devbio/start_devbio.sh \
19+
&& chmod -R a+rwX /opt/devbio/
20+
21+
RUN mkdir -p /home/biop/Desktop && chown -R biop:biop /home/biop/Desktop \
22+
&& printf '[Desktop Entry]\nVersion=0.10.1\nName=devbio-napari+OpenPIV\nGenericName=devbio-napari\nX-GNOME-FullName=devbio-napari\nComment=Scientific Image Analysis\nType=Application\nCategories=Education;Science;ImageProcessing;\nExec=/opt/devbio/start_devbio.sh\nTryExec=/opt/devbio/start_devbio.sh\nTerminal=true\nStartupNotify=true\nIcon=/opt/devbio/napari-icon.ico\nStartupWMClass=devbio-napari\n' > /home/biop/Desktop/devbio-napari.desktop \
23+
&& chown -R biop:biop /home/biop \
24+
&& chmod +x /home/biop/Desktop/devbio-napari.desktop
25+
26+
USER biop
27+
28+
# adds openpiv kernel
29+
RUN source activate openpiv \
30+
&& python -m ipykernel install --user --name openpiv --display-name "Python (openpiv)" \
31+
&& conda deactivate
32+
33+
User root
34+
35+
#################################################################
36+
# Container start
37+
USER biop
38+
WORKDIR /home/biop
39+
ENTRYPOINT ["/usr/local/bin/jupyter"]
40+
CMD ["lab", "--allow-root", "--ip=*", "--port=8888", "--no-browser", "--NotebookApp.token=''", "--NotebookApp.allow_origin='*'", "--notebook-dir=/home/biop"]
41+
42+
43+

docker/openpiv/env_openpiv.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
name: "openpiv"
2+
channels:
3+
- conda-forge
4+
- pytorch
5+
- alexlib
6+
- defaults
7+
dependencies:
8+
- python=3.9
9+
- devbio-napari=0.10.1
10+
- pyqt
11+
- pip
12+
- openpiv
13+
prefix: "/opt/conda/envs/openpiv"

docker/openpiv/readme.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
docker build -f openpiv/Dockerfile-openpiv -t biop/biop-openpiv:0.25.3 .
2+
3+
docker run -it --rm -p 8888:8888 --gpus device=0 --mount src=D:/,target=/home/biop/local,type=bind biop/biop-openpiv:0.25.3
4+
5+
docker tag biop-openpiv:0.25.3 biop/biop-openpiv:0.25.3
6+
7+
docker push biop/biop-openpiv:0.25.3

docker/openpiv/start_devbio.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
source activate openpiv
2+
napari
3+
$ read -rsp $'Press enter to continue...\n'
4+
Press enter to continue...

0 commit comments

Comments
 (0)