diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-01-20 16:23:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-01-20 16:23:43 +0000 |
| commit | 08f907a2cc67d61ae354c6ba8de1905c4f1b96c8 (patch) | |
| tree | f0a809e21f8ef399eb783ca6e39315279e312e31 /docker/mesosphere | |
| parent | 7609cc242899d6bc0151f2e19392a9fa3555e29c (diff) | |
| parent | 679014a052f3daedf1e5d6d2a476b203b2fa33f8 (diff) | |
| download | kolla-08f907a2cc67d61ae354c6ba8de1905c4f1b96c8.tar.gz kolla-08f907a2cc67d61ae354c6ba8de1905c4f1b96c8.zip | |
Merge "Add Dockerfiles for Mesos"
Diffstat (limited to 'docker/mesosphere')
| -rw-r--r-- | docker/mesosphere/mesosphere-base/Dockerfile.j2 | 17 | ||||
| -rw-r--r-- | docker/mesosphere/mesosphere-base/mesosphere.list | 2 |
2 files changed, 19 insertions, 0 deletions
diff --git a/docker/mesosphere/mesosphere-base/Dockerfile.j2 b/docker/mesosphere/mesosphere-base/Dockerfile.j2 new file mode 100644 index 000000000..b3bb57d65 --- /dev/null +++ b/docker/mesosphere/mesosphere-base/Dockerfile.j2 @@ -0,0 +1,17 @@ +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 new file mode 100644 index 000000000..54b7b1d77 --- /dev/null +++ b/docker/mesosphere/mesosphere-base/mesosphere.list @@ -0,0 +1,2 @@ +# Mesosphere repo +deb http://repos.mesosphere.com/ubuntu trusty main |