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/ubuntu | |
| 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/ubuntu')
| -rw-r--r-- | docker/ubuntu/binary/base/Dockerfile | 16 | ||||
| l--------- | docker/ubuntu/binary/base/build | 1 | ||||
| l--------- | docker/ubuntu/binary/base/kolla-common.sh | 1 | ||||
| -rw-r--r-- | docker/ubuntu/binary/keystone/Dockerfile | 22 | ||||
| l--------- | docker/ubuntu/binary/keystone/build | 1 | ||||
| l--------- | docker/ubuntu/binary/keystone/start.sh | 1 | ||||
| -rw-r--r-- | docker/ubuntu/binary/nova-base/Dockerfile | 10 | ||||
| l--------- | docker/ubuntu/binary/nova-base/build | 1 | ||||
| -rw-r--r-- | docker/ubuntu/binary/rabbitmq/Dockerfile | 13 | ||||
| l--------- | docker/ubuntu/binary/rabbitmq/build | 1 | ||||
| l--------- | docker/ubuntu/binary/rabbitmq/config-external.sh | 1 | ||||
| l--------- | docker/ubuntu/binary/rabbitmq/config-rabbit.sh | 1 | ||||
| l--------- | docker/ubuntu/binary/rabbitmq/start.sh | 1 | ||||
| -rw-r--r-- | docker/ubuntu/source/base/Dockerfile | 39 | ||||
| l--------- | docker/ubuntu/source/base/build | 1 | ||||
| l--------- | docker/ubuntu/source/base/kolla-common.sh | 1 |
16 files changed, 0 insertions, 111 deletions
diff --git a/docker/ubuntu/binary/base/Dockerfile b/docker/ubuntu/binary/base/Dockerfile deleted file mode 100644 index dbe5e97dd..000000000 --- a/docker/ubuntu/binary/base/Dockerfile +++ /dev/null @@ -1,16 +0,0 @@ -FROM ubuntu:trusty -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN apt-get update \ - && apt-get install -y --no-install-recommends software-properties-common \ - && add-apt-repository cloud-archive:kilo \ - && apt-get update \ - && apt-get upgrade -y \ - && apt-get dist-upgrade -y \ - && apt-get install -y --no-install-recommends \ - crudini \ - curl \ - openssl \ - && apt-get clean - -COPY kolla-common.sh /opt/kolla/ diff --git a/docker/ubuntu/binary/base/build b/docker/ubuntu/binary/base/build deleted file mode 120000 index 8d652f7ee..000000000 --- a/docker/ubuntu/binary/base/build +++ /dev/null @@ -1 +0,0 @@ -../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/ubuntu/binary/base/kolla-common.sh b/docker/ubuntu/binary/base/kolla-common.sh deleted file mode 120000 index c265c62f7..000000000 --- a/docker/ubuntu/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/ubuntu/binary/keystone/Dockerfile b/docker/ubuntu/binary/keystone/Dockerfile deleted file mode 100644 index 9ce96618e..000000000 --- a/docker/ubuntu/binary/keystone/Dockerfile +++ /dev/null @@ -1,22 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN apt-get install -y --no-install-recommends \ - apache2 \ - keystone \ - libapache2-mod-wsgi \ - python-keystoneclient \ - && apt-get clean - -RUN curl -o /etc/apache2/sites-available/wsgi-keystone.conf \ - https://raw.githubusercontent.com/openstack/keystone/stable/kilo/httpd/wsgi-keystone.conf -RUN ln -s /etc/apache2/sites-available/wsgi-keystone.conf /etc/apache2/sites-enabled -RUN mkdir -p /var/www/cgi-bin/keystone -RUN cp -a /usr/share/keystone/wsgi.py /var/www/cgi-bin/keystone/main -RUN cp -a /usr/share/keystone/wsgi.py /var/www/cgi-bin/keystone/admin -RUN chown -R keystone:keystone /var/www/cgi-bin/keystone -RUN chmod 755 /var/www/cgi-bin/keystone/* - -COPY start.sh / - -CMD ["/start.sh"] diff --git a/docker/ubuntu/binary/keystone/build b/docker/ubuntu/binary/keystone/build deleted file mode 120000 index 8d652f7ee..000000000 --- a/docker/ubuntu/binary/keystone/build +++ /dev/null @@ -1 +0,0 @@ -../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/ubuntu/binary/keystone/start.sh b/docker/ubuntu/binary/keystone/start.sh deleted file mode 120000 index ae34844ea..000000000 --- a/docker/ubuntu/binary/keystone/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../common/keystone/start.sh
\ No newline at end of file diff --git a/docker/ubuntu/binary/nova-base/Dockerfile b/docker/ubuntu/binary/nova-base/Dockerfile deleted file mode 100644 index 704b5d2e0..000000000 --- a/docker/ubuntu/binary/nova-base/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN apt-get install -y --no-install-recommends \ - nova-common \ - python-cinderclient \ - python-keystoneclient \ - python-nova \ - bridge-utils \ - && apt-get clean diff --git a/docker/ubuntu/binary/nova-base/build b/docker/ubuntu/binary/nova-base/build deleted file mode 120000 index 8d652f7ee..000000000 --- a/docker/ubuntu/binary/nova-base/build +++ /dev/null @@ -1 +0,0 @@ -../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/ubuntu/binary/rabbitmq/Dockerfile b/docker/ubuntu/binary/rabbitmq/Dockerfile deleted file mode 100644 index d9df48932..000000000 --- a/docker/ubuntu/binary/rabbitmq/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN apt-get install -y --no-install-recommends \ - hostname \ - rabbitmq-server \ - && apt-get clean \ - && /usr/lib/rabbitmq/bin/rabbitmq-plugins --offline enable rabbitmq_management - -COPY config-rabbit.sh config-external.sh /opt/kolla/ -COPY start.sh / - -CMD ["/start.sh"] diff --git a/docker/ubuntu/binary/rabbitmq/build b/docker/ubuntu/binary/rabbitmq/build deleted file mode 120000 index 8d652f7ee..000000000 --- a/docker/ubuntu/binary/rabbitmq/build +++ /dev/null @@ -1 +0,0 @@ -../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/ubuntu/binary/rabbitmq/config-external.sh b/docker/ubuntu/binary/rabbitmq/config-external.sh deleted file mode 120000 index e02e664c8..000000000 --- a/docker/ubuntu/binary/rabbitmq/config-external.sh +++ /dev/null @@ -1 +0,0 @@ -../../../common/rabbitmq/config-external.sh
\ No newline at end of file diff --git a/docker/ubuntu/binary/rabbitmq/config-rabbit.sh b/docker/ubuntu/binary/rabbitmq/config-rabbit.sh deleted file mode 120000 index 6feee2aba..000000000 --- a/docker/ubuntu/binary/rabbitmq/config-rabbit.sh +++ /dev/null @@ -1 +0,0 @@ -../../../common/rabbitmq/config-rabbit.sh
\ No newline at end of file diff --git a/docker/ubuntu/binary/rabbitmq/start.sh b/docker/ubuntu/binary/rabbitmq/start.sh deleted file mode 120000 index 035f55e26..000000000 --- a/docker/ubuntu/binary/rabbitmq/start.sh +++ /dev/null @@ -1 +0,0 @@ -../../../common/rabbitmq/start.sh
\ No newline at end of file diff --git a/docker/ubuntu/source/base/Dockerfile b/docker/ubuntu/source/base/Dockerfile deleted file mode 100644 index d85fcb42b..000000000 --- a/docker/ubuntu/source/base/Dockerfile +++ /dev/null @@ -1,39 +0,0 @@ -FROM ubuntu:trusty -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -RUN apt-get update \ - && apt-get install -y --no-install-recommends software-properties-common \ - && add-apt-repository cloud-archive:kilo \ - && apt-get update \ - && apt-get upgrade -y \ - && apt-get dist-upgrade -y \ - && apt-get install -y --no-install-recommends \ - crudini \ - curl \ - gcc \ - git \ - ldap-utils \ - libffi-dev \ - libxml2-dev \ - libxslt-dev \ - mysql-server\ - openssl \ - postgresql \ - python-dev \ - python-oslo-policy \ - slapd \ - sqlite \ - tar \ - && apt-get clean - -RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \ - && python get-pip.py \ - && rm get-pip.py - -RUN pip install --upgrade \ - cachetools \ - crudini \ - pip \ - tox - -COPY kolla-common.sh /opt/kolla/ diff --git a/docker/ubuntu/source/base/build b/docker/ubuntu/source/base/build deleted file mode 120000 index 8d652f7ee..000000000 --- a/docker/ubuntu/source/base/build +++ /dev/null @@ -1 +0,0 @@ -../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/ubuntu/source/base/kolla-common.sh b/docker/ubuntu/source/base/kolla-common.sh deleted file mode 120000 index c265c62f7..000000000 --- a/docker/ubuntu/source/base/kolla-common.sh +++ /dev/null @@ -1 +0,0 @@ -../../../common/base/kolla-common.sh
\ No newline at end of file |
