aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Dake <stdake@cisco.com>2015-08-14 19:46:07 -0700
committerSteven Dake <stdake@cisco.com>2015-08-19 08:03:03 -0700
commit5d671a56821bb3830dba6d739a1ddbd16ee6360f (patch)
treeb8a32137b2bc913d139bbf9f15abc67ff8352392
parent22655a19c9ea388a03c7db06400c135b0847cbfb (diff)
downloadkolla-5d671a56821bb3830dba6d739a1ddbd16ee6360f.tar.gz
kolla-5d671a56821bb3830dba6d739a1ddbd16ee6360f.zip
The requirements.txt file isn't correct
We now depend on jinja2 and docker-py for building images. We no longer depend on docker-compose for any part of our runtime so removing it as a requirement. If we keep compose in the tree, it will be for reference only, not for runtime. Change-Id: Ie663a0f183e74c14f01e9cb4fdc8763355c6415a Partially-Implements: blueprint dockerfile-template
-rwxr-xr-xrequirements.txt3
-rw-r--r--test-requirements.txt1
2 files changed, 2 insertions, 2 deletions
diff --git a/requirements.txt b/requirements.txt
index 10fa56100..4c7ccfae1 100755
--- a/requirements.txt
+++ b/requirements.txt
@@ -1 +1,2 @@
-docker-compose==1.3.0
+docker-py>=1.1.0 # Apache-2.0
+Jinja2>=2.6 # BSD License (3 clause)
diff --git a/test-requirements.txt b/test-requirements.txt
index dc12a067b..269d9f566 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -14,4 +14,3 @@ python-swiftclient>=2.2.0
testrepository>=0.0.18
testscenarios>=0.4
testtools>=0.9.36,!=1.2.0
-jinja2