From f895ee07cc5c1030e32854cf9a4e91bbeaf4de12 Mon Sep 17 00:00:00 2001 From: Steven Dake Date: Thu, 27 Aug 2015 19:23:49 -0700 Subject: 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 --- docker/ubuntu/source/base/Dockerfile | 39 ------------------------------- docker/ubuntu/source/base/build | 1 - docker/ubuntu/source/base/kolla-common.sh | 1 - 3 files changed, 41 deletions(-) delete mode 100644 docker/ubuntu/source/base/Dockerfile delete mode 120000 docker/ubuntu/source/base/build delete mode 120000 docker/ubuntu/source/base/kolla-common.sh (limited to 'docker/ubuntu/source') 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 -- cgit v1.2.3