diff --git a/Docker/lofar-ci/Dockerfile_ci_base b/Docker/lofar-ci/Dockerfile_ci_base index fb6b5d1cd6fc4763cb855b536ddd4272eb3bc4da..622dd17c934b7e6f7b20bc2a14b4ed9dab4efcc9 100644 --- a/Docker/lofar-ci/Dockerfile_ci_base +++ b/Docker/lofar-ci/Dockerfile_ci_base @@ -7,7 +7,7 @@ FROM centos:centos7.6.1810 RUN yum -y groupinstall 'Development Tools' && \ yum -y install epel-release && \ - yum -y install cmake log4cplus-devel python3 python3-devel python3-pip + yum -y install cmake gcc git log4cplus-devel python3 python3-devel python3-pip RUN adduser lofarsys diff --git a/Docker/lofar-ci/Dockerfile_ci_lta b/Docker/lofar-ci/Dockerfile_ci_lta index c4a9614d4879a16e8cadbe21e45904019e57ef73..c276ac2551a274a0cd562041fa11470e318b7eec 100644 --- a/Docker/lofar-ci/Dockerfile_ci_lta +++ b/Docker/lofar-ci/Dockerfile_ci_lta @@ -6,5 +6,4 @@ FROM ci_base:latest RUN echo "Installing packages for LTA..." && \ - yum -y install postgresql-devel && \ pip3 install kombu requests pysimplesoap mysql-connector psycopg2 flask lxml diff --git a/Docker/lofar-ci/Dockerfile_ci_mac b/Docker/lofar-ci/Dockerfile_ci_mac index 697fbbdc32aabf8264f8cd76cbcf09eda5a9d522..b578a720c021a0bf3cc3631aaf7eb8325083eb7b 100644 --- a/Docker/lofar-ci/Dockerfile_ci_mac +++ b/Docker/lofar-ci/Dockerfile_ci_mac @@ -5,7 +5,7 @@ # FROM ci_base:latest -RUN echo "Installing packages for LCU..." && \ +RUN echo "Installing packages for MAC..." && \ yum -y install readline-devel boost-python36-devel hdf5-devel blas-devel lapack-devel cfitsio-devel wcslib-devel autogen postgresql-devel cmake3 libpqxx-devel qpid-cpp-server qpid-cpp-client-devel qpid-tools unittest-cpp-devel && \ pip3 install psycopg2 testing.postgresql lxml mock numpy kombu requests python-dateutil fabric @@ -22,6 +22,6 @@ RUN echo "Installing Blitz++" && \ git clone --depth 1 https://github.com/blitzpp/blitz.git && \ mkdir -p /blitz/build && \ cd /blitz/build && \ - cmake3 --prefix=/opt/blitz/ .. && \ + cmake --prefix=/opt/blitz/ .. && \ make lib && \ make install \ No newline at end of file