Merge "Fix up base for ubuntu"

docker_templates/base/Dockerfile.j2

@@ -181,38 +181,34 @@ RUN yum update -y \
 # Endif for base_distro centos,fedora,oraclelinux
 {% elif base_distro in ['ubuntu', 'debian'] %}
 
-RUN apt-get update \
+# This will prevent questions from being asked during the install
-    && apt-get install -y --no-install-recommends software-properties-common \
+ENV DEBIAN_FRONTEND noninteractive
-    && add-apt-repository cloud-archive:kilo \
+
+COPY sources.list /etc/apt/
+
+RUN apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com 199369E5404BD5FC7D2FE43BCBCB082A1BB943DB \
+    && apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com 391A9AA2147192839E9DB0315EDB1B62EC4926EA \
+    && apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com F78372A06FF50C80464FC1B4F7B8CEA6056E8E56 \
+    && apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com 430BDF5C56E7C94E848EE60C1C4CBDCDCD2EFD2A \
+    && apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com 7D5C473EB80C00FC133071068A6844A29F68104E \
     && apt-get update \
     && apt-get upgrade -y \
     && apt-get dist-upgrade -y \
     && apt-get install -y --no-install-recommends \
         curl \
-        openssl \
+        ca-certificates \
-    && apt-get clean
+        build-essential \
-
-    {% if install_type == 'source' %}
-
-RUN apt-get install -y --no-install-recommends \
-        gcc \
-        gcc-c++ \
-        git \
-        ldap-utils \
-        libffi-dev \
-        libxml2-dev \
-        libxslt-dev \
-        mysql-server\
-        postgresql \
         python-dev \
-        python-oslo-policy \
+        libssl-dev \
-        slapd \
+        python-mysqldb \
-        sqlite \
+        libmariadbclient-dev \
-        tar \
+        libxslt1-dev \
+        libffi-dev \
+        libyaml-dev \
+        pkg-config \
     && apt-get clean
 
     # Endif for install_type source
-    {% endif %}
 {% endif %}
 
 {% if install_type == 'source' %}
@@ -221,10 +217,6 @@ RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
     && python get-pip.py \
     && rm get-pip.py
 
-RUN pip install --upgrade \
-        pip \
-        wheel
-
 # Endif for install_type source
 {% endif %}
 

docker_templates/base/sources.list

@@ -0,0 +1,20 @@
+# Default repos
+deb http://archive.ubuntu.com/ubuntu/ trusty main restricted universe multiverse
+deb http://archive.ubuntu.com/ubuntu/ trusty-updates main restricted universe multiverse
+deb http://archive.ubuntu.com/ubuntu/ trusty-security main restricted universe multiverse
+
+# Backports have a lower priority and must be explictly installed to be used
+deb http://archive.ubuntu.com/ubuntu/ trusty-backports main restricted universe multiverse
+
+# We need to add the Liberty repo for the updated packages they provide. The
+# main ones are qemu, libvirt, and openvswitch
+deb http://ubuntu-cloud.archive.canonical.com/ubuntu trusty-updates/liberty main
+
+# MariaDB 10.0 repo
+deb http://nyc2.mirrors.digitalocean.com/mariadb/repo/10.0/ubuntu trusty main
+
+# Percona repo (for xtrabackup)
+deb http://repo.percona.com/apt trusty main
+
+# RabbitMQ repo. Despite the name, the 'testing' repo is the stable repo.
+deb http://www.rabbitmq.com/debian/ testing main