From 4538f28df4a47090a2c2e07a6e074ccff14ec1b6 Mon Sep 17 00:00:00 2001
From: mancini <mancini@astron.nl>
Date: Fri, 27 Mar 2020 15:02:55 +0100
Subject: [PATCH] Refactor dockerfile
Former-commit-id: 1fb39e293754d0f814eb2d9b3c25f58bf8377564
---
Docker/.dockerignore | 1 +
Docker/Dockerfile | 17 +++++++++--------
2 files changed, 10 insertions(+), 8 deletions(-)
create mode 100644 Docker/.dockerignore
diff --git a/Docker/.dockerignore b/Docker/.dockerignore
new file mode 100644
index 0000000..f3b6411
--- /dev/null
+++ b/Docker/.dockerignore
@@ -0,0 +1 @@
+**/.git
diff --git a/Docker/Dockerfile b/Docker/Dockerfile
index 6623bb3..039a1af 100644
--- a/Docker/Dockerfile
+++ b/Docker/Dockerfile
@@ -42,11 +42,11 @@ WORKDIR /src/
# Build the IDG version from source
-ADD ./idg /src/idg/src
+COPY ./idg /src/idg/src
RUN mkdir idg/build && cd idg/build && cmake -DCMAKE_INSTALL_PREFIX=/usr/local/ ../src && make install -j$NPROCS
-ADD ./STMAN /src/STMAN/src
+COPY ./STMAN /src/STMAN/src
RUN cd /src/STMAN/ && \
mkdir build && \
cd build && \
@@ -54,7 +54,7 @@ RUN cd /src/STMAN/ && \
make -j$NPROCS && \
make install -j$NPROCS
-ADD ./Dysco /src/Dysco/src
+COPY ./Dysco /src/Dysco/src
RUN cd /src/Dysco/ && \
mkdir build && \
cd build && \
@@ -62,7 +62,7 @@ RUN cd /src/Dysco/ && \
make -j$NPROCS && \
make install -j$NPROCS
-ADD ./LOFARBeam /src/LOFARBeam/src
+COPY ./LOFARBeam /src/LOFARBeam/src
RUN cd /src/LOFARBeam/ && \
mkdir build && \
cd build && \
@@ -70,7 +70,7 @@ RUN cd /src/LOFARBeam/ && \
make -j$NPROCS && \
make install -j$NPROCS
-ADD ./aoflagger /src/aoflagger/src
+COPY ./aoflagger /src/aoflagger/src
RUN cd /src/aoflagger/ && \
mkdir build && \
cd build && \
@@ -78,7 +78,7 @@ RUN cd /src/aoflagger/ && \
make -j$NPROCS && \
make install -j$NPROCS
-ADD ./DP3 /src/dp3/src
+COPY ./DP3 /src/dp3/src
RUN cd /src/dp3/ && \
mkdir build && \
cd build && \
@@ -86,7 +86,7 @@ RUN cd /src/dp3/ && \
make -j$NPROCS && \
make install -j$NPROCS
-ADD ./wsclean/wsclean /src/WSClean/src
+COPY ./wsclean/wsclean /src/WSClean/src
RUN cd /src/WSClean/ && \
mkdir build && cd build && \
cmake ../src -DCMAKE_INSTALL_PREFIX=/usr/local/ -DPORTABLE=True &&\
@@ -128,6 +128,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libpng16-16 \
libxml2 \
lua5.3 \
+ liblua5.3 \
python3.7 \
python3-casacore \
python3-numpy \
@@ -158,7 +159,7 @@ LABEL Dysco.version.tag=${Dysco_TAG}
ARG LofarBeam_TAG=master
LABEL LOFARBeam.version.tag=${LofarBeam_TAG}
-ARG WSCLEAN_TAG=master
+ARG WSClean_TAG=master
LABEL WSClean.version.tag=${WSClean_TAG}
--
GitLab