From ed8804f7f83ee4ecb7c7e3f64c95fa46f08e2968 Mon Sep 17 00:00:00 2001 From: mancini <mancini@astron.nl> Date: Thu, 7 Nov 2019 12:13:53 +0100 Subject: [PATCH] Make portable binary, change script location --- Docker/Dockerfile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Docker/Dockerfile b/Docker/Dockerfile index 7669f0b8..e5537483 100644 --- a/Docker/Dockerfile +++ b/Docker/Dockerfile @@ -44,7 +44,7 @@ ADD ./DP3 /src/dp3/src RUN cd /src/dp3/ && \ mkdir build && \ cd build && \ - cmake ../src -DCMAKE_INSTALL_PREFIX=/usr/local/ &&\ + cmake ../src -DCMAKE_INSTALL_PREFIX=/usr/local/ -DPORTABLE=True &&\ make -j2 && \ make install -j2 @@ -106,9 +106,13 @@ RUN chown lofaruser:lofaruser /home/lofaruser/.entrypoint && \ chmod +rx /home/lofaruser/.entrypoint WORKDIR /home/lofaruser -COPY scripts/* /usr/local/bin/ + +COPY scripts/* /opt/lofar/scripts/ + +RUN ln -sf /opt/lofar/scripts/* /usr/local/bin/ + RUN chmod +rx /usr/local/bin/* -ENV PYTHONPATH="/usr/local/bin:${PYTHONPATH}" +ENV PYTHONPATH="/opt/lofar/scripts:${PYTHONPATH}" ENTRYPOINT ["/home/lofaruser/.entrypoint"] USER lofaruser -- GitLab