diff --git a/docker/Dockerfile b/docker/Dockerfile index 023ee44204822af375455258fc4259853c935f1c..d24b26c168de69d7ddceb28652862f77bde457b9 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -56,9 +56,9 @@ RUN mkdir -p /usr/local/share/casacore/data && \ tar -C /usr/local/share/casacore/data -xzf - # Build dependencies with CMake -# Targeting haswell for better x64 performance. Use PORTABLE=TRUE if you want to target non-x64 CPU architectures -# ARG PORTABLE=TRUE -ARG TARGET_CPU=haswell +# Target haswell for better x64 performance. Use PORTABLE=TRUE if you want to target a broader range of CPU architectures +ARG PORTABLE=TRUE +# ARG TARGET_CPU=haswell # Casacore ARG CASACORE_COMMIT=master @@ -160,29 +160,29 @@ LABEL \ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ apt-get install -y \ - git \ - libblas3 \ - libboost-filesystem1.74.0 \ - libboost-program-options1.74.0 \ - libboost-python1.74.0 \ - libcfitsio9 \ - libfftw3-double3 \ - libfftw3-single3 \ - libgfortran5 \ - libglib2.0-0 \ - libgomp1 \ - libgsl27 \ - libgtkmm-3.0-1v5 \ - libhdf5-103-1 \ - libhdf5-cpp-103-1 \ - liblapack3 \ - liblua5.3-0 \ - libpng16-16 \ - libpython3.10 \ - libstdc++6 \ - python3 \ - python3-distutils \ - wget && \ + git \ + libblas3 \ + libboost-filesystem1.74.0 \ + libboost-program-options1.74.0 \ + libboost-python1.74.0 \ + libcfitsio9 \ + libfftw3-double3 \ + libfftw3-single3 \ + libgfortran5 \ + libglib2.0-0 \ + libgomp1 \ + libgsl27 \ + libgtkmm-3.0-1v5 \ + libhdf5-103-1 \ + libhdf5-cpp-103-1 \ + liblapack3 \ + liblua5.3-0 \ + libpng16-16 \ + libpython3.10 \ + libstdc++6 \ + python3 \ + python3-distutils \ + wget && \ rm -rf /var/lib/apt/lists/* # Install ms_tools diff --git a/docker/docker_build.sh b/docker/docker_build.sh index 4e802366fb2a927cab18b8421e6eaffcd52328f3..05cd08b6f7b1e1ed8b6f4127181fa945341cb45c 100644 --- a/docker/docker_build.sh +++ b/docker/docker_build.sh @@ -26,4 +26,3 @@ docker build \ --tag ${IMAGE_NAME}:latest \ . - echo "Succesfully build docker file"