Merge pull request #57 from nmfs-opensci/eeholmes-patch-1

Eeholmes patch 1
nmfs-opensci · Nov 22, 2024 · f34cb2a · f34cb2a
2 parents 65d1604 + dfe79df
commit f34cb2a
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 247 deletions.
diff --git a/draft_images/test/Desktop/cdat.desktop b/draft_images/test/Desktop/cdat.desktop
diff --git a/draft_images/test/Desktop/cdat.png b/draft_images/test/Desktop/cdat.png
diff --git a/draft_images/test/Desktop/panoply.desktop b/draft_images/test/Desktop/panoply.desktop
diff --git a/draft_images/test/Desktop/qgis.desktop b/draft_images/test/Desktop/qgis.desktop
diff --git a/draft_images/test/Desktop/qgis.xml b/draft_images/test/Desktop/qgis.xml
diff --git a/draft_images/test/Desktop/zotero.desktop b/draft_images/test/Desktop/zotero.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Type=Application
+Name=Zotero
+GenericName=Zotero Bibliography Manager
+Icon=zotero
+TryExec=zotero
+Exec=zotero %F
+Terminal=false
+StartupNotify=false
+Categories=Education;Science;
+Keywords=bibliography;
diff --git a/draft_images/test/Desktop/panoply.png → draft_images/test/Desktop/zotero.png b/draft_images/test/Desktop/panoply.png → draft_images/test/Desktop/zotero.png
diff --git a/draft_images/test/Dockerfile b/draft_images/test/Dockerfile
@@ -9,6 +9,7 @@ RUN cd /tmp && \
 
 COPY . /tmp2/
 RUN /pyrocket_scripts/install-apt-packages.sh /tmp2/apt.txt || echo "install-apt-packages.sh failed" || true
+RUN /pyrocket_scripts/install-desktop.sh /tmp2/Desktop|| echo "setup-desktop.sh failed" || true
 RUN rm -rf /tmp2
 
 USER ${NB_USER}

diff --git a/draft_images/test/apt.txt b/draft_images/test/apt.txt
@@ -1,2 +1,3 @@
 zotero
+libpci-dev