diff options
| author | Sam Yaple <sam@yaple.net> | 2015-09-15 07:44:18 +0000 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-09-16 10:15:00 +0000 |
| commit | 84ea8fbc9d7f10cd47c3c7e3d77359c630d44b2c (patch) | |
| tree | ce3c18fcefcea20862cafc04c8d08977226ba4a8 /docker/base/Dockerfile.j2 | |
| parent | 8cdaf01c0a7a215c80a64cdcbe8b523b5c7d59dd (diff) | |
| download | kolla-84ea8fbc9d7f10cd47c3c7e3d77359c630d44b2c.tar.gz kolla-84ea8fbc9d7f10cd47c3c7e3d77359c630d44b2c.zip | |
Use Liberty cloudarchive repo for Ubuntu
Additionally remove rabbitmq since the correct version is now provided
in cloudarchive repo.
Change-Id: I215f03c4770f3049a9498c36c6ee9e819ce0acae
Closes-Bug: #1495836
Diffstat (limited to 'docker/base/Dockerfile.j2')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 26bb55add..d6968330b 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -189,9 +189,7 @@ 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-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com 7F6C9F236D170493FCF404F27EBFDD5D17ED316D \ && apt-get update \ && apt-get upgrade -y \ |