diff --git a/faser-daq/Dockerfile b/faser-daq/Dockerfile index a89eec6d6d09a192878c14f69b0bbc9944eedc77..fd6507b19b773cb6a82d096793757cac77facd38 100644 --- a/faser-daq/Dockerfile +++ b/faser-daq/Dockerfile @@ -15,19 +15,12 @@ WORKDIR /faser/daq # yum remove -y git && \ # yum install -y git2u && \ # yum clean all + # python3-devel for the rcgui gevent RUN yum install -y python3-devel && \ yum clean all -# RUN yum --enablerepo=centos-sclo-rh -y install rh-python38 && \ -# yum clean all - -#RUN scl enable rh-python38 bash - -#RUN scl enable rh-python38 bash - -ADD https://raw.githubusercontent.com/Sumalyo/faser-docker-fork/dev/requirements.txt /faser/daq -#to be replaced with a requirements file from faser repo once it is ready +COPY requirements.txt /faser/daq RUN python3 -m pip install --upgrade pip @@ -35,6 +28,7 @@ RUN python3 -m pip install -r requirements.txt RUN source /daqling-spack-repo/spack/share/spack/setup-env.sh && spack env activate daqling && spack load curl && spack add zstd brotli lz4 googletest && spack install +# get xrootd for xrdcp RUN yum install -y xrootd-client && \ yum clean all @@ -158,8 +152,8 @@ ADD https://gitlab.cern.ch/ep-dt-di/daq/daqling/-/raw/master/ansible/roles/super ADD https://gitlab.cern.ch/ep-dt-di/daq/daqling/-/raw/master/ansible/roles/supervisor/files/inet_http_server.conf /etc/supervisor/conf.d/ ADD https://gitlab.cern.ch/ep-dt-di/daq/daqling/-/raw/master/ansible/roles/supervisor-twiddler/files/twiddler.conf /etc/supervisor/conf.d/ + RUN sed -i 's/\[group:daq\]/[group:faser]/' /etc/supervisor/conf.d/twiddler.conf -# to be edited to run faser group ADD https://gitlab.cern.ch/ep-dt-di/daq/daqling/-/raw/master/ansible/roles/redis/files/redis.conf /etc/ diff --git a/faser-daq/requirements.txt b/faser-daq/requirements.txt new file mode 100644 index 0000000000000000000000000000000000000000..159a28ff32318a47d44028478c4eff48f8dd5d55 --- /dev/null +++ b/faser-daq/requirements.txt @@ -0,0 +1,64 @@ +anytree==2.8.0 +attrs==21.2.0 +certifi==2021.5.30 +chardet==4.0.0 +idna==2.10 +importlib-metadata==4.6.0 +jsonschema==3.2.0 +pyrsistent==0.18.0 +pyzmq==22.1.0 +requests==2.25.1 +six==1.16.0 +typing-extensions==3.10.0.0 +zipp==3.4.1 +zmq==0.0.0 +aniso8601==9.0.1 +apispec==4.7.0 +bidict==0.21.2 +cached-property==1.5.2 +cffi==1.14.5 +click==8.0.1 +cryptography==3.4.7 +cx-Oracle==8.2.1 +dataclasses==0.8 +Flask==2.0.1 +flask-apispec==0.11.0 +Flask-Caching==1.10.1 +Flask-Login==0.5.0 +flask-redis==0.4.0 +Flask-RESTful==0.3.9 +Flask-Scss==0.5 +gevent==21.1.2 +greenlet==1.1.0 +gunicorn==20.1.0 +influxdb==5.3.1 +itsdangerous==2.0.1 +Jinja2==3.0.1 +#keycloak==3.0.2 +MarkupSafe==2.0.1 +marshmallow==3.12.1 +msgpack==1.0.2 +pycparser==2.20 +PyJWT==2.1.0 +pymongo==3.11.4 +pyScss==1.3.7 +python-dateutil==2.8.1 +python-engineio==4.2.0 +python-socketio==5.3.0 +pytz==2021.1 +PyYAML==5.4.1 +redis==3.5.3 +webargs==8.0.0 +Werkzeug==2.0.1 +zope.event==4.5.0 +zope.interface==5.4.0 +async_generator +contextvars +flask_socketio +jsonref==0.3.0 +supervisor +supervisor_twiddler +zmq +urllib3==1.26.6 +flask_cors +eventlet \ No newline at end of file