@@ -8,42 +8,42 @@ ARG KAFKAOPMONVERSION=v2.0.0 # For OpMonSubscriber.py from kafkaopmon
88ARG LOCALPYDIR=/microservices_python
99
1010RUN yum clean all \
11- && yum -y install gcc make git unzip libpq-devel libffi-devel python3-pip python3-wheel krb5-devel python3-devel \
12- && yum clean all
11+ && yum -y install gcc make git unzip libpq-devel libffi-devel python3-pip python3-wheel krb5-devel python3-devel \
12+ && yum clean all
1313
1414# Can drop when migration to sqlalchemy is complete since we're using the thin client there
15- RUN curl -O https://download.oracle.com/otn_software/linux/instantclient/1919000/oracle-instantclient19.19-basic-19.19.0.0.0-1.el9.x86_64.rpm && \
16- yum -y install libaio libnsl && \
17- rpm -iv oracle-instantclient19.19-basic-19.19.0.0.0-1.el9.x86_64.rpm
15+ RUN curl -O https://download.oracle.com/otn_software/linux/instantclient/1919000/oracle-instantclient19.19-basic-19.19.0.0.0-1.el9.x86_64.rpm \
16+ && yum -y install libaio libnsl \
17+ && rpm -iv oracle-instantclient19.19-basic-19.19.0.0.0-1.el9.x86_64.rpm
1818
1919COPY requirements.txt /
20- RUN python3 -m pip install --upgrade setuptools && \
21- python3 -m pip install -r requirements.txt && \
22- python3 -m pip cache remove \*
20+ RUN python3 -m pip install --upgrade setuptools \
21+ && python3 -m pip install -r requirements.txt \
22+ && python3 -m pip cache remove \*
2323
2424# elisa_client_api needed by the logbook microservice
25- RUN git clone https://github.com/DUNE-DAQ/elisa_client_api.git && \
26- python3 -m pip install --upgrade setuptools && \
27- python3 -m pip install ./elisa_client_api
25+ RUN git clone https://github.com/DUNE-DAQ/elisa_client_api.git \
26+ && python3 -m pip install --upgrade setuptools \
27+ && python3 -m pip install ./elisa_client_api
2828
2929# protoc-24.3-linux-x86_64.zip is the latest zipfile available as of Sep-15-2023
3030# See also https://grpc.io/docs/protoc-installation/#install-pre-compiled-binaries-any-os
3131
32- RUN curl -LO https://github.com/protocolbuffers/protobuf/releases/download/v24.3/protoc-24.3-linux-x86_64.zip && \
33- unzip protoc-24.3-linux-x86_64.zip && \
34- curl -O https://raw.githubusercontent.com/DUNE-DAQ/ers/$ERSVERSION/schema/ers/issue.proto && \
35- mkdir -p $LOCALPYDIR/ers && \
36- protoc --python_out=$LOCALPYDIR/ers issue.proto && \
37- curl -O https://raw.githubusercontent.com/DUNE-DAQ/opmonlib/$OPMONLIBVERSION/schema/opmonlib/opmon_entry.proto && \
38- mkdir -p $LOCALPYDIR/opmonlib && \
39- protoc --python_out=$LOCALPYDIR/opmonlib -I/ -I/include opmon_entry.proto
32+ RUN curl -LO https://github.com/protocolbuffers/protobuf/releases/download/v24.3/protoc-24.3-linux-x86_64.zip \
33+ && unzip protoc-24.3-linux-x86_64.zip \
34+ && curl -O https://raw.githubusercontent.com/DUNE-DAQ/ers/$ERSVERSION/schema/ers/issue.proto \
35+ && mkdir -p $LOCALPYDIR/ers \
36+ && protoc --python_out=$LOCALPYDIR/ers issue.proto \
37+ && curl -O https://raw.githubusercontent.com/DUNE-DAQ/opmonlib/$OPMONLIBVERSION/schema/opmonlib/opmon_entry.proto \
38+ && mkdir -p $LOCALPYDIR/opmonlib \
39+ && protoc --python_out=$LOCALPYDIR/opmonlib -I/ -I/include opmon_entry.proto
4040
41- RUN mkdir -p $LOCALPYDIR/erskafka && \
42- curl https://raw.githubusercontent.com/DUNE-DAQ/erskafka/$ERSKAFKAVERSION/python/erskafka/ERSSubscriber.py -o $LOCALPYDIR/erskafka/ERSSubscriber.py && \
43- mkdir -p $LOCALPYDIR/kafkaopmon && \
44- curl https://raw.githubusercontent.com/DUNE-DAQ/kafkaopmon/$KAFKAOPMONVERSION/python/kafkaopmon/OpMonSubscriber.py -o $LOCALPYDIR/kafkaopmon/OpMonSubscriber.py
41+ RUN mkdir -p $LOCALPYDIR/erskafka \
42+ && curl https://raw.githubusercontent.com/DUNE-DAQ/erskafka/$ERSKAFKAVERSION/python/erskafka/ERSSubscriber.py -o $LOCALPYDIR/erskafka/ERSSubscriber.py \
43+ && mkdir -p $LOCALPYDIR/kafkaopmon \
44+ && curl https://raw.githubusercontent.com/DUNE-DAQ/kafkaopmon/$KAFKAOPMONVERSION/python/kafkaopmon/OpMonSubscriber.py -o $LOCALPYDIR/kafkaopmon/OpMonSubscriber.py
4545
4646ENV PYTHONPATH=$LOCALPYDIR:$PYTHONPATH
4747
4848# This ensures the container will run as non-root by default. Hat tip Pat Riehecky.
49- # USER 60000:0 # [Commented out so various entrypoint.sh scripts as of Sep-12-2023 continue to work, to be addressed later]
49+ # USER 60000:0 # [Commented out so various entrypoint.sh scripts as of Sep-12-2023 continue to work, to be addressed later]
0 commit comments