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/mesos | |
| 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/mesos')
| -rw-r--r-- | docker/mesos/mesos-base/Dockerfile.j2 | 16 | ||||
| -rw-r--r-- | docker/mesos/mesos-master/Dockerfile.j2 | 10 | ||||
| -rw-r--r-- | docker/mesos/mesos-slave/Dockerfile.j2 | 37 | ||||
| -rw-r--r-- | docker/mesos/mesos-slave/docker.list | 2 | ||||
| -rw-r--r-- | docker/mesos/mesos-slave/docker.repo | 6 |
5 files changed, 0 insertions, 71 deletions
diff --git a/docker/mesos/mesos-base/Dockerfile.j2 b/docker/mesos/mesos-base/Dockerfile.j2 deleted file mode 100644 index 8b97a8c74..000000000 --- a/docker/mesos/mesos-base/Dockerfile.j2 +++ /dev/null @@ -1,16 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}mesosphere-base:{{ tag }} -MAINTAINER {{ maintainer }} - -{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} - -RUN yum -y install \ - mesos \ - && yum clean all - -{% elif base_distro in ['ubuntu', 'debian'] %} - -RUN apt-get install -y --no-install-recommends \ - mesos \ - && apt-get clean - -{% endif %} diff --git a/docker/mesos/mesos-master/Dockerfile.j2 b/docker/mesos/mesos-master/Dockerfile.j2 deleted file mode 100644 index 7bad7dee1..000000000 --- a/docker/mesos/mesos-master/Dockerfile.j2 +++ /dev/null @@ -1,10 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}mesos-base:{{ tag }} -MAINTAINER {{ maintainer }} - -RUN useradd --user-group mesos - -CMD ["mesos-master"] - -{{ include_footer }} - -USER mesos diff --git a/docker/mesos/mesos-slave/Dockerfile.j2 b/docker/mesos/mesos-slave/Dockerfile.j2 deleted file mode 100644 index 791b61555..000000000 --- a/docker/mesos/mesos-slave/Dockerfile.j2 +++ /dev/null @@ -1,37 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}mesos-base:{{ tag }} -MAINTAINER {{ maintainer }} - -{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} - -COPY docker.repo /etc/yum.repos.d/docker.repo - -RUN rpm --import https://yum.dockerproject.org/gpg - -RUN yum -y install \ - docker-engine \ - && yum clean all - -{% elif base_distro in ['ubuntu', 'debian'] %} - -COPY docker.list /etc/apt/sources.list.d/docker.list - -RUN apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv 58118E89F3A912897C070ADBF76221572C52609D \ - && apt-get update - -RUN apt-get install -y --no-install-recommends \ - docker-engine \ - && apt-get clean - -{% endif %} - -ENV MESOS_CONTAINERIZERS docker -# Increase executor's timeout for pulling a Docker image to the slave -# https://mesosphere.github.io/marathon/docs/native-docker.html -ENV MESOS_EXECUTOR_REGISTRATION_TIMEOUT 5mins - -CMD ["mesos-slave"] - -{{ include_footer }} - -# This container should run as a root, because it's talking to the Docker -# socket directly. diff --git a/docker/mesos/mesos-slave/docker.list b/docker/mesos/mesos-slave/docker.list deleted file mode 100644 index 45c9c88fb..000000000 --- a/docker/mesos/mesos-slave/docker.list +++ /dev/null @@ -1,2 +0,0 @@ -# Docker repo -deb http://apt.dockerproject.org/repo ubuntu-trusty main diff --git a/docker/mesos/mesos-slave/docker.repo b/docker/mesos/mesos-slave/docker.repo deleted file mode 100644 index a66294c93..000000000 --- a/docker/mesos/mesos-slave/docker.repo +++ /dev/null @@ -1,6 +0,0 @@ -[dockerrepo] -name=Docker Repository -baseurl=https://yum.dockerproject.org/repo/main/centos/7 -enabled=1 -gpgcheck=1 -gpgkey=https://yum.dockerproject.org/gpg |
