From ccb70816caee830e608fa29e6ad3ed85b39af3c5 Mon Sep 17 00:00:00 2001 From: Jorrit Schaap <schaap@astron.nl> Date: Thu, 20 Oct 2022 14:54:53 +0200 Subject: [PATCH] TMSS-2036: build ci_lta docker image on top of ci_scu to include the tmss backend --- Docker/lofar-ci/Dockerfile_ci_lta | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/Docker/lofar-ci/Dockerfile_ci_lta b/Docker/lofar-ci/Dockerfile_ci_lta index 9c67961e428..d5647ef5c05 100644 --- a/Docker/lofar-ci/Dockerfile_ci_lta +++ b/Docker/lofar-ci/Dockerfile_ci_lta @@ -1,31 +1,16 @@ # -# This builds an image with all dependencies for the LTA package based on the ci_base image +# This builds an image with all dependencies for the LTA and TMSSBackend/TMSSClient packages based on the ci_scu image # # base # ARG BASE_VERSION=latest -FROM ci_base:$BASE_VERSION +FROM ci_scu:$BASE_VERSION -RUN echo "Installing packages for LTA..." +RUN echo "Installing extra packages for LTA..." -RUN yum install -y nmap-ncat boost readline-devel boost-devel binutils-devel boost-python36 boost-python36-devel openldap-devel java-11-openjdk python-twisted-core graphviz - -# 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 postgresql10 postgresql10-server postgresql10-devel && \ - cd /bin && ln -s /usr/pgsql-10/bin/initdb && ln -s /usr/pgsql-10/bin/postgres -ENV PATH /usr/pgsql-10/bin:$PATH - -RUN pip3 install pysimplesoap mysql-connector flask lxml jsonschema psycopg2 testing.postgresql kombu lxml requests pygcn xmljson mysql-connector-python python-dateutil Django==3.0.9 djangorestframework==3.11.1 djangorestframework-xml ldap==1.0.2 flask fabric coverage python-qpid-proton PyGreSQL numpy h5py psycopg2 Flask-Testing scipy Markdown django-filter python-ldap python-ldap-test ldap3 django-jsonforms django-json-widget django-jsoneditor drf-yasg flex swagger-spec-validator django-auth-ldap mozilla-django-oidc jsonschema comet pyxb==1.2.5 graphviz isodate astropy packaging django-debug-toolbar pymysql astroplan SimpleWebSocketServer websocket_client psutil Django==3.0.9 djangorestframework==3.11.1 djangorestframework-xml ldap==1.0.2 django-filter python-ldap python-ldap-test ldap3 django-jsonforms django-json-widget django-jsoneditor drf-yasg flex swagger-spec-validator django-auth-ldap mozilla-django-oidc jsonschema comet pyxb==1.2.5 drf-flex-fields django-property-filter django-material cachetools - -# Note: nodejs now comes with npm, do not install the npm package separately, since that will be taken from the epel repo and is conflicting. -RUN echo "Installing Nodejs packages..." && \ - curl -sL https://rpm.nodesource.com/setup_14.x | bash - && \ - yum install -y nodejs && \ - npm -v && \ - node -v && \ - npm install -g serve +USER root +RUN yum install -y nmap-ncat +RUN pip3 install pysimplesoap mysql-connector flask lxml requests pygcn xmljson mysql-connector-python pymysql psutil RUN adduser ingest USER ingest -- GitLab