docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adding mesos 0.26 Dockerfile for tests 

Signed-off-by: Isabel Jimenez <contact@isabeljimenez.com>
This commit is contained in:
Isabel Jimenez 2016-01-22 14:05:22 -05:00
parent 5978ee4b22
commit b290a62342
4 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/mesos/task/task.go
View File

@ -219,7 +219,7 @@ func (t *Task) Monitor() (bool, []byte, error) {
return true, taskStatus.Data, nil return true, taskStatus.Data, nil
case mesosproto.TaskState_TASK_FAILED: case mesosproto.TaskState_TASK_FAILED:
errorMessage := taskStatus.GetMessage() errorMessage := taskStatus.GetMessage()
if errorMessage == "Abnormal executor termination" { if strings.Contains(errorMessage, "Abnormal executor termination") {
errorMessage += " : please verify your SWARM_MESOS_USER is correctly set" errorMessage += " : please verify your SWARM_MESOS_USER is correctly set"
} }
return true, nil, errors.New(errorMessage) return true, nil, errors.New(errorMessage)

0
test/integration/mesos/Dockerfile-0.25 → test/integration/mesos/Dockerfile-0.25.0
View File

12
test/integration/mesos/Dockerfile-0.26.0 Normal file
View File

@ -0,0 +1,12 @@
FROM debian:8
MAINTAINER Victor Vieux <vieux@docker.com>
MAINTAINER Isabel Jimenez <isabel@mesosphere.com>
RUN apt-get update && apt-get install wget python -y
RUN wget http://downloads.mesosphere.io/master/debian/8/mesos_0.26.0-0.2.145.debian81_amd64.deb -O /tmp/mesos.deb
RUN dpkg -i /tmp/mesos.deb || true
RUN apt-get install -f -y
USER daemon

2
test/integration/mesos/mesos_helpers.bash
View File

@ -5,7 +5,7 @@
export SWARM_MESOS_TASK_TIMEOUT=30s export SWARM_MESOS_TASK_TIMEOUT=30s
export SWARM_MESOS_USER=root export SWARM_MESOS_USER=root
MESOS_IMAGE=dockerswarm/mesos:0.25.0 MESOS_IMAGE=dockerswarm/mesos:0.26.0
MESOS_MASTER_PORT=$(( ( RANDOM % 1000 ) + 10000 )) MESOS_MASTER_PORT=$(( ( RANDOM % 1000 ) + 10000 ))
# Start mesos master and agent. # Start mesos master and agent.