commit 3aee9414b7bf61ca8e3ef7d20b6f54f37ba365da
author Scott Baker <smbaker@gmail.com> Tue Sep 29 09:12:02 2015 -0700
committer Scott Baker <smbaker@gmail.com> Tue Sep 29 09:12:02 2015 -0700
tree 3a568bbb932e4310186b56c92606137c32d5d006
parent f4e8b4618bc54eada8fde51c12a36fcc87653c28
parent b42d5b45877ab22a5fc945223ac8668a564ebaa3

Merge branch 'master' of github.com:open-cloud/xos

Dockerfile

diff --git a/Dockerfile b/Dockerfile
index d09d73b..5d945a9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,8 +4,8 @@
 # XXX Workaround for docker bug:
 # https://github.com/docker/docker/issues/6345
 # Kernel 3.15 breaks docker, uss the line below as a workaround
-# until there is a fix 
-RUN ln -s -f /bin/true /usr/bin/chfn 
+# until there is a fix
+RUN ln -s -f /bin/true /usr/bin/chfn
 # XXX End workaround
 
 # Install.
@@ -23,12 +23,12 @@
     python-httplib2 \
     geoip-database \
     libgeoip1 \
-    wget \ 
-    curl \ 
+    wget \
+    curl \
     python-dev \
-    libyaml-dev \ 
-    pkg-config \ 
-    python-pycurl 
+    libyaml-dev \
+    pkg-config \
+    python-pycurl
 
 RUN pip install django==1.7
 RUN pip install djangorestframework==2.4.4
@@ -64,6 +64,7 @@
 RUN easy_install python_gflags
 RUN easy_install --upgrade httplib2
 RUN easy_install google_api_python_client
+RUN easy_install httplib2.ca_certs_locater
 
 # Install custom Ansible
 RUN DEBIAN_FRONTEND=noninteractive apt-get install -y python-crypto
@@ -97,7 +98,7 @@
 RUN DEBIAN_FRONTEND=noninteractive apt-get install -y supervisor
 ADD observer.conf /etc/supervisor/conf.d/
 
-# Get XOS 
+# Get XOS
 ADD xos /opt/xos
 
 # Initscript is broken in Ubuntu