Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cherry pick of #15367 #15255 upstream release 1.1 - mesos 0.24 #15434

Merged
merged 3 commits into from Oct 10, 2015
Merged

Cherry pick of #15367 #15255 upstream release 1.1 - mesos 0.24 #15434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1e67843
Use mesos-slave-dind docker image with overlay-over-overlay smoketest
sttts Oct 9, 2015
0fbc75e
Update mesos/docker cluster mesos version to 0.24
Oct 7, 2015
98701c7
Update mesos/docker cluster docker base images
Oct 7, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions cluster/mesos/docker/docker-compose.yml
View file
Open in desktop
Expand Up @@ -13,7 +13,7 @@ etcd:
--initial-cluster-state new
mesosmaster1:
hostname: mesosmaster1
image: mesosphere/mesos:0.23.0-1.0.ubuntu1404
image: mesosphere/mesos:0.24.0-1.0.27.ubuntu1404
entrypoint: [ "mesos-master" ]
ports: [ "5050:5050" ]
environment:
Expand All @@ -29,7 +29,7 @@ mesosmaster1:
mesosslave:
hostname: mesosslave
privileged: true
image: mesosphere/mesos-slave-dind:0.23.0-1.0.ubuntu1404.docker181
image: mesosphere/mesos-slave-dind:mesos-0.24.0_dind-0.2_docker-1.8.2_ubuntu-14.04.3
entrypoint:
- bash
- -xc
Expand Down
2 changes: 1 addition & 1 deletion cluster/mesos/docker/keygen/Dockerfile
View file
Open in desktop
@@ -1,4 +1,4 @@
FROM ubuntu:14.04.2
FROM ubuntu:14.04.3
MAINTAINER Mesosphere <support@mesosphere.io>

RUN locale-gen en_US.UTF-8
Expand Down
2 changes: 1 addition & 1 deletion cluster/mesos/docker/km/Dockerfile
View file
Open in desktop
@@ -1,4 +1,4 @@
FROM ubuntu:14.04.2
FROM ubuntu:14.04.3
MAINTAINER Mesosphere <support@mesosphere.io>

RUN locale-gen en_US.UTF-8
Expand Down
2 changes: 1 addition & 1 deletion cluster/mesos/docker/test/Dockerfile
View file
Open in desktop
@@ -1,4 +1,4 @@
FROM golang:1.4.2
FROM golang:1.4.3
MAINTAINER Mesosphere <support@mesosphere.io>

# docker.io is suppossed to be in backports, but it's not there yet.
Expand Down