Commit 107e2c2d authored by Zolnierczuk, Piotr's avatar Zolnierczuk, Piotr
Browse files

improved dockerfile

parent e67a7d2e
Loading
Loading
Loading
Loading
+1 −2
Original line number Diff line number Diff line
@@ -12,13 +12,12 @@ RUN apt-get install -y python3 python3-pip
RUN apt-get install -y python-is-python3
RUN apt-get install -y qt5-default python3-pyqt5
RUN apt-get install -y libxt6 libxrender1 libxext6 libgl1-mesa-glx libqt5widgets5
RUN apt-get install -y texlive
RUN apt-get install -y texlive texlive-pictures texlive-latex-extra
RUN pip3 install numpy scipy matplotlib jupyter
RUN cd /usr/local && wget https://gr-framework.org/downloads/gr-latest-Debian-x86_64.tar.gz -O - | tar xzv
WORKDIR $WORKDIR
RUN mkdir -p $BUILDIR
COPY . $BUILDIR
#RUN cd $BUILDIR && git clone https://jugit.fz-juelich.de/nse/drspine.git
COPY Makefile.def $BUILDIR
RUN  cd $BUILDIR && make -ks doc 2> /dev/null
RUN  cd $BUILDIR && make -ks bins test
+1 −0
Original line number Diff line number Diff line
@@ -55,5 +55,6 @@ tarball:

build-docker:
	docker build -t  $(PROJECT):$(VERSION_MAJOR).$(VERSION_MINOR) .
	docker tag       $(PROJECT):$(VERSION_MAJOR).$(VERSION_MINOR) $(PROJECT):latest

.PHONY: all bins docs clean test runtest install tarball libs pylibs distclean
+10 −4
Original line number Diff line number Diff line
#!/bin/bash
#
TAG="drspine:1.4"
TAG="drspine"
#
_UID=$(id -u)
_GID=$(id -g)
DATA_SRC=/SNS/NSE
DATA_DST=/SNS/NSE
#
WORK_SRC=$(pwd)
WORK_SRC=$(pwd)/wrk
WORK_DST=/workdir
docker run --rm --interactive --tty \
mkdir -p  ${WORK_SRC}
chmod 755 ${WORK_SRC}
cp drspine_profile dr_macro dr_histo ${WORK_SRC}
docker run --rm \
    --interactive --tty \
    --mount type=bind,src=${DATA_SRC},dst=${DATA_DST},readonly=true  \
    --mount type=bind,src=${WORK_SRC},dst=${WORK_DST} \
    --user ${_UID}:${_GID} \
    ${TAG}