From 3af17444d06eb41b8fbf38f4e94cf42d9f14ec18 Mon Sep 17 00:00:00 2001 From: Cameron Motevasselani Date: Tue, 16 Feb 2021 23:39:37 -0800 Subject: [PATCH] fix(dependencies): inlining dependencies to try and fix build (#260) Co-authored-by: Cameron Motevasselani --- Dockerfile.slim | 1 - Dockerfile.ubuntu | 1 - spinnaker-monitoring-daemon/constraints.txt | 1 - spinnaker-monitoring-daemon/requirements.txt | 2 +- .../third_party/datadog/constraints.txt | 1 - .../third_party/datadog/requirements.txt | 2 +- .../third_party/prometheus/constraints.txt | 1 - .../third_party/prometheus/requirements.txt | 2 +- .../third_party/stackdriver/constraints.txt | 1 - .../third_party/stackdriver/requirements.txt | 2 +- 10 files changed, 4 insertions(+), 10 deletions(-) delete mode 100644 spinnaker-monitoring-daemon/constraints.txt delete mode 100644 spinnaker-monitoring-third-party/third_party/datadog/constraints.txt delete mode 100644 spinnaker-monitoring-third-party/third_party/prometheus/constraints.txt delete mode 100644 spinnaker-monitoring-third-party/third_party/stackdriver/constraints.txt diff --git a/Dockerfile.slim b/Dockerfile.slim index 212919b..5f6c1a5 100644 --- a/Dockerfile.slim +++ b/Dockerfile.slim @@ -8,7 +8,6 @@ RUN addgroup -S -g 10111 spinnaker RUN adduser -S -G spinnaker -u 10111 spinnaker COPY spinnaker-monitoring-daemon/requirements.txt /opt/spinnaker-monitoring/requirements.txt -COPY spinnaker-monitoring-daemon/constraints.txt /opt/spinnaker-monitoring/constraints.txt WORKDIR /opt/spinnaker-monitoring diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu index 12729ad..33dd563 100644 --- a/Dockerfile.ubuntu +++ b/Dockerfile.ubuntu @@ -8,7 +8,6 @@ RUN adduser --system --uid 10111 --group spinnaker RUN apt-get update && apt-get install -y python python2.7 python-pip wget COPY spinnaker-monitoring-daemon/requirements.txt /opt/spinnaker-monitoring/requirements.txt -COPY spinnaker-monitoring-daemon/constraints.txt /opt/spinnaker-monitoring/constraints.txt WORKDIR /opt/spinnaker-monitoring RUN sed -ie 's/#@ //g' requirements.txt diff --git a/spinnaker-monitoring-daemon/constraints.txt b/spinnaker-monitoring-daemon/constraints.txt deleted file mode 100644 index 6100c97..0000000 --- a/spinnaker-monitoring-daemon/constraints.txt +++ /dev/null @@ -1 +0,0 @@ -rsa==4.5 diff --git a/spinnaker-monitoring-daemon/requirements.txt b/spinnaker-monitoring-daemon/requirements.txt index 9837f6f..a74138b 100644 --- a/spinnaker-monitoring-daemon/requirements.txt +++ b/spinnaker-monitoring-daemon/requirements.txt @@ -1,5 +1,5 @@ # sudo apt-get install python-dev --c constraints.txt +rsa==4.5 --index-url https://pypi.python.org/simple/ # 20170226 diff --git a/spinnaker-monitoring-third-party/third_party/datadog/constraints.txt b/spinnaker-monitoring-third-party/third_party/datadog/constraints.txt deleted file mode 100644 index 6100c97..0000000 --- a/spinnaker-monitoring-third-party/third_party/datadog/constraints.txt +++ /dev/null @@ -1 +0,0 @@ -rsa==4.5 diff --git a/spinnaker-monitoring-third-party/third_party/datadog/requirements.txt b/spinnaker-monitoring-third-party/third_party/datadog/requirements.txt index 51898f3..6f173a6 100644 --- a/spinnaker-monitoring-third-party/third_party/datadog/requirements.txt +++ b/spinnaker-monitoring-third-party/third_party/datadog/requirements.txt @@ -1,5 +1,5 @@ # sudo apt-get install python-dev ---constraint constraints.txt +rsa==4.5 --index-url https://pypi.python.org/simple/ datadog diff --git a/spinnaker-monitoring-third-party/third_party/prometheus/constraints.txt b/spinnaker-monitoring-third-party/third_party/prometheus/constraints.txt deleted file mode 100644 index 6100c97..0000000 --- a/spinnaker-monitoring-third-party/third_party/prometheus/constraints.txt +++ /dev/null @@ -1 +0,0 @@ -rsa==4.5 diff --git a/spinnaker-monitoring-third-party/third_party/prometheus/requirements.txt b/spinnaker-monitoring-third-party/third_party/prometheus/requirements.txt index d1040d3..6cd37f5 100644 --- a/spinnaker-monitoring-third-party/third_party/prometheus/requirements.txt +++ b/spinnaker-monitoring-third-party/third_party/prometheus/requirements.txt @@ -1,5 +1,5 @@ # sudo apt-get install python-dev ---constraint constraints.txt +rsa==4.5 --index-url https://pypi.python.org/simple/ prometheus_client diff --git a/spinnaker-monitoring-third-party/third_party/stackdriver/constraints.txt b/spinnaker-monitoring-third-party/third_party/stackdriver/constraints.txt deleted file mode 100644 index 6100c97..0000000 --- a/spinnaker-monitoring-third-party/third_party/stackdriver/constraints.txt +++ /dev/null @@ -1 +0,0 @@ -rsa==4.5 diff --git a/spinnaker-monitoring-third-party/third_party/stackdriver/requirements.txt b/spinnaker-monitoring-third-party/third_party/stackdriver/requirements.txt index 16baa36..61d13c4 100644 --- a/spinnaker-monitoring-third-party/third_party/stackdriver/requirements.txt +++ b/spinnaker-monitoring-third-party/third_party/stackdriver/requirements.txt @@ -1,5 +1,5 @@ # sudo apt-get install python-dev ---constraint constraints.txt +rsa==4.5 --index-url https://pypi.python.org/simple/ google-api-python-client >= 1.7.8