diff options
| author | Davanum Srinivas <davanum@gmail.com> | 2016-05-03 08:35:22 -0400 |
|---|---|---|
| committer | Davanum Srinivas (dims) <davanum@gmail.com> | 2016-05-03 21:39:57 +0000 |
| commit | fa88ce2e4cfad840090e5e00dba75d3ff8f6bc7f (patch) | |
| tree | 9aedb685dc7b59b61f4017465a792e81352f9b19 /docker/mesosphere/mesosphere-base | |
| parent | 31d1271f1e0f19f1326c2e3858c5b0a2dc3c59ba (diff) | |
| download | kolla-fa88ce2e4cfad840090e5e00dba75d3ff8f6bc7f.tar.gz kolla-fa88ce2e4cfad840090e5e00dba75d3ff8f6bc7f.zip | |
Cleanup Mesos/Marathon related work
We got rid of the kolla-mesos repo:
http://git.openstack.org/cgit/openstack/kolla-mesos/tree/README.rst
So we don't need things in the main kolla tree
related to Mesos/Marathon
Closes-Bug: #1577951
Change-Id: Iafae63914c8a6601dc1b5b04231af8a1d2cc8642
Diffstat (limited to 'docker/mesosphere/mesosphere-base')
| -rw-r--r-- | docker/mesosphere/mesosphere-base/Dockerfile.j2 | 17 | ||||
| -rw-r--r-- | docker/mesosphere/mesosphere-base/mesosphere.list | 2 |
2 files changed, 0 insertions, 19 deletions
diff --git a/docker/mesosphere/mesosphere-base/Dockerfile.j2 b/docker/mesosphere/mesosphere-base/Dockerfile.j2 deleted file mode 100644 index b3bb57d65..000000000 --- a/docker/mesosphere/mesosphere-base/Dockerfile.j2 +++ /dev/null @@ -1,17 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} -MAINTAINER {{ maintainer }} - -{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} - -RUN rpm --import http://repos.mesosphere.io/el/RPM-GPG-KEY-mesosphere - -RUN rpm -Uvh http://repos.mesosphere.com/el/7/noarch/RPMS/mesosphere-el-repo-7-1.noarch.rpm - -{% elif base_distro in ['ubuntu', 'debian'] %} - -COPY mesosphere.list /etc/apt/sources.list.d/mesosphere.list - -RUN apt-key adv --keyserver keyserver.ubuntu.com --recv 81026D0004C44CF7EF55ADF8DF7D54CBE56151BF \ - && apt-get update - -{% endif %} diff --git a/docker/mesosphere/mesosphere-base/mesosphere.list b/docker/mesosphere/mesosphere-base/mesosphere.list deleted file mode 100644 index 54b7b1d77..000000000 --- a/docker/mesosphere/mesosphere-base/mesosphere.list +++ /dev/null @@ -1,2 +0,0 @@ -# Mesosphere repo -deb http://repos.mesosphere.com/ubuntu trusty main |