diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-09 17:12:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-09 17:12:12 +0000 |
| commit | 996802ba76444cdaef8ccc58ae6e9413fc7dc2d6 (patch) | |
| tree | 061d174fccd4ac635d25f7b9d3b738a84cab4242 /docker/ol | |
| parent | 694265d30a955dae3d72e2cd598e260538c082b5 (diff) | |
| parent | 67c3c6b28ad69bc3ff6ead269e46cea5a7b95bc8 (diff) | |
| download | kolla-996802ba76444cdaef8ccc58ae6e9413fc7dc2d6.tar.gz kolla-996802ba76444cdaef8ccc58ae6e9413fc7dc2d6.zip | |
Merge "Remove crux from base Dockerfiles"
Diffstat (limited to 'docker/ol')
| -rw-r--r-- | docker/ol/source/base/Dockerfile | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/docker/ol/source/base/Dockerfile b/docker/ol/source/base/Dockerfile index f75e56328..f9a76c9bd 100644 --- a/docker/ol/source/base/Dockerfile +++ b/docker/ol/source/base/Dockerfile @@ -14,7 +14,7 @@ RUN yum install -y \ tar \ && yum clean all -# TODO(pbourke): replace pip and crux below with rpms once available in Oracle +# TODO(pbourke): replace pip below with rpms once available in Oracle # repos RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \ && python get-pip.py \ @@ -22,10 +22,4 @@ RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \ RUN pip install crudini -RUN curl https://codeload.github.com/larsks/crux/tar.gz/7 -o /crux-7.tar.gz \ - && tar -xf /crux-7.tar.gz \ - && pip install -r /crux-7/requirements.txt \ - && pip install /crux-7 \ - && rm -rf /crux-7.tar.gz /crux-7 - COPY kolla-common.sh /opt/kolla/ |