From 26a8fec48a2bb083cd970e1cf7d43f260ab3686c Mon Sep 17 00:00:00 2001
From: Jorrit Schaap <schaap@astron.nl>
Date: Fri, 20 Mar 2020 11:35:06 +0100
Subject: [PATCH] TMSS-163: added missing packages
---
Docker/lofar-ci/Dockerfile_ci_base | 2 +-
Docker/lofar-ci/Dockerfile_ci_lta | 1 -
Docker/lofar-ci/Dockerfile_ci_mac | 4 ++--
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/Docker/lofar-ci/Dockerfile_ci_base b/Docker/lofar-ci/Dockerfile_ci_base
index fb6b5d1cd6f..622dd17c934 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 c4a9614d487..c276ac2551a 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 697fbbdc32a..b578a720c02 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
--
GitLab