diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-01-06 16:03:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-01-06 16:03:22 +0000 |
| commit | 8d66ded6bdeedd2367933159565a7de0046ffb3a (patch) | |
| tree | 39c057cc7403e7c2ed45ea076a1dc0b3221abe2f /docker | |
| parent | 68326daf88828b50094cf422b40cf57e53c40b5a (diff) | |
| parent | 8843f6ff5273bf8476144214d6ba20e89a612847 (diff) | |
| download | kolla-8d66ded6bdeedd2367933159565a7de0046ffb3a.tar.gz kolla-8d66ded6bdeedd2367933159565a7de0046ffb3a.zip | |
Merge "Lock Fedora-based image to specific versions"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/fedora-rdo-base/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/hautoproxy/Dockerfile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docker/fedora-rdo-base/Dockerfile b/docker/fedora-rdo-base/Dockerfile index 981b12f7a..f40c5a96b 100644 --- a/docker/fedora-rdo-base/Dockerfile +++ b/docker/fedora-rdo-base/Dockerfile @@ -1,4 +1,4 @@ -FROM fedora +FROM fedora:20 MAINTAINER Kolla Project (https://launchpad.net/kolla) # Set up repositories diff --git a/docker/hautoproxy/Dockerfile b/docker/hautoproxy/Dockerfile index 1472c88d8..d421ca488 100644 --- a/docker/hautoproxy/Dockerfile +++ b/docker/hautoproxy/Dockerfile @@ -1,4 +1,4 @@ -FROM fedora +FROM fedora:20 MAINTAINER Kolla Project (https://launchpad.net/kolla) RUN yum -y install haproxy python-jinja2; yum clean all |