diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-11-25 00:17:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-11-25 00:17:39 +0000 |
| commit | 12975e55042c0fc94fa38de84fba62f0ff068c17 (patch) | |
| tree | fea259e8a6c0ec149eca6624ec8281204e433556 /docker/base/Dockerfile.j2 | |
| parent | 3a8157211251787b9c1941c698ec13e427106e3e (diff) | |
| parent | 7910044803dfdca5236815ddea1b4fed6e720ab2 (diff) | |
| download | kolla-12975e55042c0fc94fa38de84fba62f0ff068c17.tar.gz kolla-12975e55042c0fc94fa38de84fba62f0ff068c17.zip | |
Merge "Pin specific version of Ceph"
Diffstat (limited to 'docker/base/Dockerfile.j2')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index a550b6364..0d497b816 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -117,6 +117,12 @@ RUN yum install -y https://rdo.fedorapeople.org/rdo-release.rpm \ RUN yum update -y \ && yum clean all +# Pin package versions +RUN yum install -y \ + yum-plugin-versionlock \ + && yum clean all +COPY versionlock.list /etc/yum/pluginconf.d/ + {% if install_type == 'binary' %} # Install base packages @@ -147,10 +153,12 @@ RUN yum -y install \ ENV DEBIAN_FRONTEND noninteractive COPY sources.list /etc/apt/ +COPY apt_preferences /etc/apt/preferences 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 430BDF5C56E7C94E848EE60C1C4CBDCDCD2EFD2A \ + && apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com 08B73419AC32B4E966C1A330E84AC2C0460F3994 \ && apt-get update \ && apt-get upgrade -y \ && apt-get dist-upgrade -y \ |
