fix(dependencies): inlining dependencies to try and fix build (#260)

Co-authored-by: Cameron Motevasselani <cameron@armory.io>
spinnaker · Feb 17, 2021 · 3af1744 · 3af1744
1 parent 27d064c
commit 3af1744
Show file tree

Hide file tree

Showing 10 changed files with 4 additions and 10 deletions.
diff --git 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
@@ -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
diff --git 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
diff --git 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
diff --git 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
diff --git 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