From 6b0cfa1f24bc800d74c0ad04fa2ae9ee809be085 Mon Sep 17 00:00:00 2001
From: domna <florian.dobener@physik.hu-berlin.de>
Date: Wed, 16 Aug 2023 15:04:43 +0200
Subject: [PATCH] Adds specsscan and specsanalyzer to fhi container
---
.gitlab-ci.yml | 12 ++++++------
docker/mpes/Dockerfile.fhi | 10 ++++++----
docker/mpes/Dockerfile.fhi.jupyter | 6 +++++-
3 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ee0d9cd..5b9c2f6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -40,12 +40,12 @@ workflow:
DIR: docker/fiji
- IMAGE_NAME: nexus-webtop
DIR: docker/nexus
- - IMAGE_NAME: mpes-jupyter-fhi
- DIR: docker/mpes
- DOCKERFILE: Dockerfile.fhi.jupyter
- - IMAGE_NAME: mpes-webtop-fhi
- DIR: docker/mpes
- DOCKERFILE: Dockerfile.fhi
+ # - IMAGE_NAME: mpes-jupyter-fhi
+ # DIR: docker/mpes
+ # DOCKERFILE: Dockerfile.fhi.jupyter
+ # - IMAGE_NAME: mpes-webtop-fhi
+ # DIR: docker/mpes
+ # DOCKERFILE: Dockerfile.fhi
stages:
- build
diff --git a/docker/mpes/Dockerfile.fhi b/docker/mpes/Dockerfile.fhi
index b658cd0..7cda811 100644
--- a/docker/mpes/Dockerfile.fhi
+++ b/docker/mpes/Dockerfile.fhi
@@ -5,13 +5,14 @@ COPY requirements.jupyter.in ./
RUN apt-get update -y \
&& apt-get install -y git pip qt5-default python3-pyqt5 pyqt5-dev-tools cargo unzip \
&& apt-get clean && rm -rf /var/lib/apt/lists/*
-RUN pip install -r requirements.jupyter.in
-RUN pip install -r requirements.webtop.in
+RUN pip install -r requirements.webtop.txt
+COPY specsscan/specsanalyzer-0.1.0-py3-none-any.whl ./specsanalyzer.whl
+COPY specsscan/specsscan-0.1.0-py3-none-any.whl ./specsscan.whl
+RUN pip install specsanalyzer.whl specsscan.whl
RUN jupyter nbextension enable --py widgetsnbextension \
&& jupyter serverextension enable jupyterlab_h5web \
&& jupyter lab build
-RUN rm requirements.webtop.in
-RUN rm requirements.jupyter.in
+RUN rm requirements.webtop.txt specsanalyzer.whl specsscan.whl
COPY 02-exec-cmd /config/custom-cont-init.d/02-exec-cmd
WORKDIR /config
@@ -23,3 +24,4 @@ RUN mkdir /scratch
RUN ln -s /config/localDataStore /scratch/localDataStore
RUN mkdir /etc/sed
RUN ln -s /mnt/pcshare/sed/config.yaml /etc/sed/config.yaml
+RUN ln -s /mnt/pcshare/specsscan/config.yaml /etc/specsanalyzer/config.yaml
diff --git a/docker/mpes/Dockerfile.fhi.jupyter b/docker/mpes/Dockerfile.fhi.jupyter
index 7084a05..a5d632c 100644
--- a/docker/mpes/Dockerfile.fhi.jupyter
+++ b/docker/mpes/Dockerfile.fhi.jupyter
@@ -10,7 +10,10 @@ RUN pip install --no-cache-dir -r requirements.jupyter.txt \
&& jupyter serverextension enable jupyterlab_h5web \
&& fix-permissions "${CONDA_DIR}" \
&& fix-permissions "/home/${NB_USER}"
-RUN rm requirements.jupyter.txt
+COPY specsscan/specsanalyzer-0.1.0-py3-none-any.whl ./specsanalyzer.whl
+COPY specsscan/specsscan-0.1.0-py3-none-any.whl ./specsscan.whl
+RUN pip install specsanalyzer.whl specsscan.whl
+RUN rm requirements.jupyter.txt specsanalyzer.whl specsscan.whl
USER root
RUN apt-get update --yes && \
@@ -24,4 +27,5 @@ RUN mkdir /scratch
RUN ln -s ${HOME}/localDataStore /scratch/localDataStore
RUN mkdir /etc/sed
RUN ln -s /mnt/pcshare/sed/config.yaml /etc/sed/config.yaml
+RUN ln -s /mnt/pcshare/specsscan/config.yaml /etc/specsanalyzer/config.yaml
USER $NB_UID
--
GitLab