From 9adc9dd835bdb3c010b7f8a087c98c9e23c80455 Mon Sep 17 00:00:00 2001
From: Jorrit Schaap <schaap@astron.nl>
Date: Fri, 20 Mar 2020 15:48:51 +0100
Subject: [PATCH] TMSS-163: added missing packages and symlinks
---
Docker/lofar-ci/Dockerfile_ci_base | 4 +++-
Docker/lofar-ci/Dockerfile_ci_lta | 3 ++-
Docker/lofar-ci/Dockerfile_ci_sas | 3 ++-
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/Docker/lofar-ci/Dockerfile_ci_base b/Docker/lofar-ci/Dockerfile_ci_base
index 622dd17c934..8c862f187de 100644
--- a/Docker/lofar-ci/Dockerfile_ci_base
+++ b/Docker/lofar-ci/Dockerfile_ci_base
@@ -7,7 +7,9 @@ FROM centos:centos7.6.1810
RUN yum -y groupinstall 'Development Tools' && \
yum -y install epel-release && \
- yum -y install cmake gcc git log4cplus-devel python3 python3-devel python3-pip
+ yum -y install cmake gcc git log4cplus-devel python3 python3-devel python3-pip which wget curl atop
+
+RUN pip3 install kombu requests coverage
RUN adduser lofarsys
diff --git a/Docker/lofar-ci/Dockerfile_ci_lta b/Docker/lofar-ci/Dockerfile_ci_lta
index b791b90ab33..9b026080b49 100644
--- a/Docker/lofar-ci/Dockerfile_ci_lta
+++ b/Docker/lofar-ci/Dockerfile_ci_lta
@@ -10,7 +10,8 @@ RUN echo "Installing packages for LTA..."
# see https://www.postgresql.org/download/linux/redhat/ on how to install postgresql-server > 9.2 on centos7
RUN yum erase -y postgresql postgresql-server postgresql-devel && \
yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-7-x86_64/pgdg-redhat-repo-latest.noarch.rpm && \
- yum install -y postgresql96 postgresql96-server postgresql96-devel
+ yum install -y postgresql96 postgresql96-server postgresql96-devel && \
+ cd /bin && ln -s /usr/pgsql-9.6/bin/initb && ln -s /usr/pgsql-9.6/bin/postgres
ENV PATH /usr/pgsql-9.6/bin:$PATH
RUN pip3 install kombu requests pysimplesoap mysql-connector flask lxml jsonschema psycopg2 testing.postgresql
diff --git a/Docker/lofar-ci/Dockerfile_ci_sas b/Docker/lofar-ci/Dockerfile_ci_sas
index b7657fbf49b..02578f876f6 100644
--- a/Docker/lofar-ci/Dockerfile_ci_sas
+++ b/Docker/lofar-ci/Dockerfile_ci_sas
@@ -11,7 +11,8 @@ RUN echo "Installing packages for SAS..." && \
# see https://www.postgresql.org/download/linux/redhat/ on how to install postgresql-server > 9.2 on centos7
RUN yum erase -y postgresql postgresql-server postgresql-devel && \
yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-7-x86_64/pgdg-redhat-repo-latest.noarch.rpm && \
- yum install -y postgresql96 postgresql96-server postgresql96-devel
+ yum install -y postgresql96 postgresql96-server postgresql96-devel && \
+ cd /bin && ln -s /usr/pgsql-9.6/bin/initb && ln -s /usr/pgsql-9.6/bin/postgres
ENV PATH /usr/pgsql-9.6/bin:$PATH
RUN pip3 install cython kombu lxml requests pygcn xmljson mysql-connector-python python-dateutil django djangorestframework djangorestframework-xml ldap==1.0.2 flask fabric coverage python-qpid-proton PyGreSQL numpy h5py psycopg2 testing.postgresql Flask-Testing scipy Markdown django-filter python-ldap python-ldap-test ldap3 djangorestframework django-jsonforms django-json-widget django-jsoneditor drf-yasg flex swagger-spec-validator django-auth-ldap mozilla-django-oidc jsonschema comet
--
GitLab