apply changes made to Dockerfile to devel/templ dockerfiles
diff --git a/containers/xos/Dockerfile.devel b/containers/xos/Dockerfile.devel
index 69abbbc..f2d225e 100644
--- a/containers/xos/Dockerfile.devel
+++ b/containers/xos/Dockerfile.devel
@@ -29,7 +29,7 @@
python-setuptools \
tar \
wget \
-##### observer dependencies
+##### synchronizer dependencies
python-keystoneclient \
python-novaclient \
python-neutronclient \
@@ -37,19 +37,22 @@
python-ceilometerclient
RUN pip install \
- django==1.7 \
+ ca-certs-locater \
+ django>=1.8,<1.8.99 \
django-bitfield \
django-crispy-forms \
django-encrypted-fields \
django-extensions \
- django-filter==0.11.0 \
+ django-filter \
django-geoposition \
django-ipware \
django_rest_swagger \
- django-suit==0.3a1 \
+ django-suit==0.3a3 \
django-timezones \
djangorestframework==3.3.3 \
dnslib \
+ google-api-python-client \
+ httplib2 \
lxml \
markdown \
netaddr \
@@ -57,6 +60,7 @@
psycopg2 \
python-ceilometerclient \
python-dateutil \
+ python-gflags \
python-keyczar \
python-logstash \
pygraphviz \
@@ -64,14 +68,7 @@
pyyaml \
requests
-RUN easy_install --upgrade httplib2
-
-RUN easy_install \
- python_gflags \
- google_api_python_client \
- httplib2.ca_certs_locater
-
-ADD http://code.jquery.com/jquery-1.9.1.min.js /usr/local/lib/python2.7/dist-packages/suit/static/suit/js/
+ADD http://code.jquery.com/jquery-1.12.3.min.js /usr/local/lib/python2.7/dist-packages/suit/static/suit/js/
# Install XOS
ADD xos /opt/xos
diff --git a/containers/xos/Dockerfile.templ b/containers/xos/Dockerfile.templ
index 982a661..8e74f19 100644
--- a/containers/xos/Dockerfile.templ
+++ b/containers/xos/Dockerfile.templ
@@ -29,36 +29,38 @@
python-setuptools \
tar \
wget \
-##### observer dependencies
+##### synchronizer dependencies
python-keystoneclient \
python-novaclient \
python-neutronclient \
python-glanceclient \
python-ceilometerclient
-RUN pip install -U \
- django==1.7 \
+RUN pip install \
+ ca-certs-locater \
+ django>=1.8,<1.8.99 \
django-bitfield \
django-crispy-forms \
django-encrypted-fields \
- django_evolution \
django-extensions \
- django-filter==0.11.0 \
+ django-filter \
django-geoposition \
django-ipware \
django_rest_swagger \
- django-suit==0.3a1 \
+ django-suit==0.3a3 \
django-timezones \
djangorestframework==3.3.3 \
dnslib \
- google_api_python_client \
+ google-api-python-client \
httplib2 \
- httplib2.ca_certs_locater \
lxml \
markdown \
netaddr \
+ pyOpenSSL \
+ psycopg2 \
+ python-ceilometerclient \
python-dateutil \
- python_gflags \
+ python-gflags \
python-keyczar \
python-logstash \
pygraphviz \
@@ -66,7 +68,7 @@
pyyaml \
requests
-ADD http://code.jquery.com/jquery-1.9.1.min.js /usr/local/lib/python2.7/dist-packages/suit/static/suit/js/
+ADD http://code.jquery.com/jquery-1.12.3.min.js /usr/local/lib/python2.7/dist-packages/suit/static/suit/js/
# Install XOS
RUN git clone XOS_GIT_REPO -b XOS_GIT_BRANCH /tmp/xos && \