diff options
| author | Steven Dake <stdake@cisco.com> | 2015-08-27 19:23:49 -0700 |
|---|---|---|
| committer | Steven Dake <stdake@cisco.com> | 2015-08-28 00:50:30 -0700 |
| commit | f895ee07cc5c1030e32854cf9a4e91bbeaf4de12 (patch) | |
| tree | cc7d17c2c63bf83f6a983553b8729f67abeac58d /docker/ol | |
| parent | 5c82e0c90ce0fedf523b11b0b933f2276edf8f46 (diff) | |
| download | kolla-f895ee07cc5c1030e32854cf9a4e91bbeaf4de12.tar.gz kolla-f895ee07cc5c1030e32854cf9a4e91bbeaf4de12.zip | |
Remove docker directory
Remove the docker directory (yay) and old build tools.
This will result in an f21 failing gate - however, I have a patch
submission to remove that gate from our project configuration.
Change-Id: I3c461cedb6906422c8076f60c470e773d6cdcf33
Partially-Implements: blueprint remove-docker-dir
Diffstat (limited to 'docker/ol')
| -rw-r--r-- | docker/ol/binary/base/Dockerfile | 12 | ||||
| l--------- | docker/ol/binary/base/build | 1 | ||||
| l--------- | docker/ol/binary/base/kolla-common.sh | 1 | ||||
| -rw-r--r-- | docker/ol/source/base/Dockerfile | 25 | ||||
| l--------- | docker/ol/source/base/build | 1 | ||||
| l--------- | docker/ol/source/base/kolla-common.sh | 1 | ||||
| l--------- | docker/ol/source/keystone | 1 |
7 files changed, 0 insertions, 42 deletions
diff --git a/docker/ol/binary/base/Dockerfile b/docker/ol/binary/base/Dockerfile deleted file mode 100644 index 169cb5f3a..000000000 --- a/docker/ol/binary/base/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -FROM oraclelinux:7.1 -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN yum update -y \ - && yum install -y git \ - && yum clean all \ - && curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \ - && python get-pip.py \ - && rm -f get-pip.py \ - && pip install crudini - -COPY kolla-common.sh /opt/kolla/ diff --git a/docker/ol/binary/base/build b/docker/ol/binary/base/build deleted file mode 120000 index 8d652f7ee..000000000 --- a/docker/ol/binary/base/build +++ /dev/null @@ -1 +0,0 @@ -../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/ol/binary/base/kolla-common.sh b/docker/ol/binary/base/kolla-common.sh deleted file mode 120000 index c265c62f7..000000000 --- a/docker/ol/binary/base/kolla-common.sh +++ /dev/null @@ -1 +0,0 @@ -../../../common/base/kolla-common.sh
\ No newline at end of file diff --git a/docker/ol/source/base/Dockerfile b/docker/ol/source/base/Dockerfile deleted file mode 100644 index f9a76c9bd..000000000 --- a/docker/ol/source/base/Dockerfile +++ /dev/null @@ -1,25 +0,0 @@ -FROM oraclelinux:7.1 -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -# Dependencies required for building/installing source components -RUN yum install -y \ - MySQL-python \ - gcc \ - git \ - libffi-devel \ - mariadb \ - openssl \ - openssl-devel \ - python-devel \ - tar \ - && yum clean all - -# 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 \ - && rm get-pip.py - -RUN pip install crudini - -COPY kolla-common.sh /opt/kolla/ diff --git a/docker/ol/source/base/build b/docker/ol/source/base/build deleted file mode 120000 index 8d652f7ee..000000000 --- a/docker/ol/source/base/build +++ /dev/null @@ -1 +0,0 @@ -../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/ol/source/base/kolla-common.sh b/docker/ol/source/base/kolla-common.sh deleted file mode 120000 index c265c62f7..000000000 --- a/docker/ol/source/base/kolla-common.sh +++ /dev/null @@ -1 +0,0 @@ -../../../common/base/kolla-common.sh
\ No newline at end of file diff --git a/docker/ol/source/keystone b/docker/ol/source/keystone deleted file mode 120000 index f66ecff4e..000000000 --- a/docker/ol/source/keystone +++ /dev/null @@ -1 +0,0 @@ -../../centos/source/keystone/
\ No newline at end of file |