Skip to content
Snippets Groups Projects
Unverified Commit c087f680 authored by Andrew Morgan's avatar Andrew Morgan Committed by GitHub
Browse files

Cap the version of prometheus_client to <v0.9.0 in the dockerfile (#8767)

parent 34226ec7
No related branches found
No related tags found
No related merge requests found
Fix a dependency versioning bug in the Dockerfile that prevented Synapse from starting.
...@@ -36,7 +36,8 @@ RUN pip install --prefix="/install" --no-warn-script-location \ ...@@ -36,7 +36,8 @@ RUN pip install --prefix="/install" --no-warn-script-location \
frozendict \ frozendict \
jaeger-client \ jaeger-client \
opentracing \ opentracing \
prometheus-client \ # Match the version constraints of Synapse
"prometheus_client>=0.4.0,<0.9.0" \
psycopg2 \ psycopg2 \
pycparser \ pycparser \
pyrsistent \ pyrsistent \
......
...@@ -72,6 +72,10 @@ REQUIREMENTS = [ ...@@ -72,6 +72,10 @@ REQUIREMENTS = [
# prom-client has a history of breaking backwards compatibility between # prom-client has a history of breaking backwards compatibility between
# minor versions (https://github.com/prometheus/client_python/issues/317), # minor versions (https://github.com/prometheus/client_python/issues/317),
# so we also pin the minor version. # so we also pin the minor version.
#
# Note that we replicate these constraints in the Synapse Dockerfile while
# pre-installing dependencies. If these constraints are updated here, the
# same change should be made in the Dockerfile.
"prometheus_client>=0.4.0,<0.9.0", "prometheus_client>=0.4.0,<0.9.0",
# we use attr.validators.deep_iterable, which arrived in 19.1.0 (Note: # we use attr.validators.deep_iterable, which arrived in 19.1.0 (Note:
# Fedora 31 only has 19.1, so if we want to upgrade we should wait until 33 # Fedora 31 only has 19.1, so if we want to upgrade we should wait until 33
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment