From f125785a3adccb0acd5b87433df641db3dae7ea9 Mon Sep 17 00:00:00 2001
From: Jorrit Schaap <schaap@astron.nl>
Date: Mon, 16 Mar 2020 12:21:15 +0100
Subject: [PATCH] TMSS-163: Update Dockerfile_ci_sas
---
Docker/lofar-ci/Dockerfile_ci_sas | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/Docker/lofar-ci/Dockerfile_ci_sas b/Docker/lofar-ci/Dockerfile_ci_sas
index ddc875a6c38..07d193ed5de 100644
--- a/Docker/lofar-ci/Dockerfile_ci_sas
+++ b/Docker/lofar-ci/Dockerfile_ci_sas
@@ -6,12 +6,12 @@
FROM ci_base:latest
RUN echo "Installing packages for SAS..." && \
- yum install -y epel-release
-
-RUN yum install -y cmake gcc-c++ make log4cplus log4cplus-devel python3 python3-libs python3-devel boost readline-devel boost-devel binutils-devel boost-python36 boost-python36-devel gettext which openldap-devel npm nodejs git java-11-openjdk # 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
-RUN yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-7-x86_64/pgdg-redhat-repo-latest.noarch.rpm
-RUN yum install -y postgresql96 postgresql96-server postgresql96-devel
+ yum install -y log4cplus log4cplus-devel python3 python3-libs python3-devel boost readline-devel boost-devel binutils-devel boost-python36 boost-python36-devel gettext which openldap-devel npm nodejs git java-11-openjdk
+
+# 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
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
@@ -20,5 +20,3 @@ RUN npm install -g npx && \
npm install -g n && \
n stable && \
npm install -g serve
-
-RUN adduser lofarsys USER lofarsys
--
GitLab