Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM almalinux:8

RUN dnf -y install epel-release && \
dnf -y upgrade ca-certificates --disablerepo=epel && \
rpm -i http://dist.eugridpma.info/distribution/igtf/1.125/accredited/RPMS/ca_COMODO-RSA-CA-1.125-1.noarch.rpm && \
rpm -i http://dist.eugridpma.info/distribution/igtf/1.125/accredited/RPMS/ca_InCommon-IGTF-Server-CA-1.125-1.noarch.rpm && \
dnf install -y python3-pip && \
ln -s /usr/bin/python3 /usr/bin/python && \
pip3 install 'elasticsearch>=6.0.0,<7.0.0' 'elasticsearch-dsl>=6.0.0,<7.0.0' htcondor requests prometheus_client
yum install -y https://repo.opensciencegrid.org/osg/23-main/osg-23-main-el8-release-latest.rpm && \
yum install -y osg-ca-certs && \
dnf install -y python38 python38-pip && \
dnf clean all && yum clean all && \
ln -s /usr/bin/python3.8 /usr/bin/python && \
pip3.8 install --no-cache-dir 'elasticsearch>=6.0.0,<7.0.0' 'elasticsearch-dsl>=6.0.0,<7.0.0' htcondor requests prometheus_client

COPY . /monitoring

Expand Down
2 changes: 1 addition & 1 deletion condor_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -741,7 +741,7 @@ def read_from_file(filename):
Args:
filename (str): filename to read
"""
with (gzip.open(filename) if filename.endswith('.gz') else open(filename)) as f:
with (gzip.open(filename, 'rt', encoding='utf-8') if filename.endswith('.gz') else open(filename)) as f:
entry = ''
for line in f.readlines():
if line.startswith('***'):
Expand Down