Skip to content

K
k3s
Commit 49a5f899 authored by Karl Isenberg's avatar Karl Isenberg
Browse files
Options

Merge pull request #15255 from mesosphere/mesos-docker-versions

MESOS: Update mesos/docker cluster docker images
parents 83720911 f86c09ae
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
cluster/mesos/docker/docker-compose.yml
View file @ 49a5f899
...@@ -13,7 +13,7 @@ etcd: ...@@ -13,7 +13,7 @@ etcd:
--initial-cluster-state new --initial-cluster-state new
mesosmaster1: mesosmaster1:
hostname: 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" ] entrypoint: [ "mesos-master" ]
ports: [ "5050:5050" ] ports: [ "5050:5050" ]
environment: environment:
......
cluster/mesos/docker/keygen/Dockerfile
View file @ 49a5f899
FROM ubuntu:14.04.2 FROM ubuntu:14.04.3
MAINTAINER Mesosphere <support@mesosphere.io> MAINTAINER Mesosphere <support@mesosphere.io>
RUN locale-gen en_US.UTF-8 RUN locale-gen en_US.UTF-8
......
cluster/mesos/docker/km/Dockerfile
View file @ 49a5f899
FROM ubuntu:14.04.2 FROM ubuntu:14.04.3
MAINTAINER Mesosphere <support@mesosphere.io> MAINTAINER Mesosphere <support@mesosphere.io>
RUN locale-gen en_US.UTF-8 RUN locale-gen en_US.UTF-8
......
cluster/mesos/docker/test/Dockerfile
View file @ 49a5f899
FROM golang:1.4.2 FROM golang:1.4.3
MAINTAINER Mesosphere <support@mesosphere.io> MAINTAINER Mesosphere <support@mesosphere.io>
# docker.io is suppossed to be in backports, but it's not there yet. # docker.io is suppossed to be in backports, but it's not there yet.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment