Skip to content

Commit 83feb1e

Browse files
author
Phil Winder
committed
Upgrade: Mesos=0.26.0, Docker=1.9.1
1 parent 7af6211 commit 83feb1e

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM ubuntu:14.04
22
MAINTAINER Container Solutions BV <info@container-solutions.com>
33

4-
ENV VERSION "0.25.0-0.2.70.ubuntu1404"
4+
ENV VERSION "0.26.0-0.2.145.ubuntu1404"
55

66
RUN echo "deb http://ppa.launchpad.net/openjdk-r/ppa/ubuntu trusty main" > /etc/apt/sources.list.d/openjdk.list && \
77
apt-key adv --keyserver keyserver.ubuntu.com --recv 86F44E2A && \

agent/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM ubuntu:14.04
22
MAINTAINER Container Solutions BV <info@container-solutions.com>
33

4-
ENV VERSION "0.25.0-0.2.70.ubuntu1404"
4+
ENV VERSION "0.26.0-0.2.145.ubuntu1404"
55

66
RUN echo "deb http://ppa.launchpad.net/openjdk-r/ppa/ubuntu trusty main" > /etc/apt/sources.list.d/openjdk.list && \
77
apt-key adv --keyserver keyserver.ubuntu.com --recv 86F44E2A && \
@@ -15,8 +15,8 @@ RUN echo "deb http://repos.mesosphere.io/ubuntu trusty main" > /etc/apt/sources.
1515
apt-get -y install curl mesos=${VERSION} && \
1616
rm -rf /var/lib/apt/lists/*
1717

18-
RUN curl -so /usr/bin/docker https://get.docker.com/builds/Linux/x86_64/docker-1.8.3 && chmod +x /usr/bin/docker
18+
RUN curl -so /usr/bin/docker https://get.docker.com/builds/Linux/x86_64/docker-1.9.1 && chmod +x /usr/bin/docker
1919

2020
ADD ./mesos-slave-wrapper /usr/local/bin/mesos-slave-wrapper
21-
21+
2222
ENTRYPOINT ["/usr/local/bin/mesos-slave-wrapper"]

master/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM ubuntu:14.04
22
MAINTAINER Container Solutions BV <info@container-solutions.com>
33

4-
ENV VERSION "0.25.0-0.2.70.ubuntu1404"
4+
ENV VERSION "0.26.0-0.2.145.ubuntu1404"
55

66
RUN echo "deb http://ppa.launchpad.net/openjdk-r/ppa/ubuntu trusty main" > /etc/apt/sources.list.d/openjdk.list && \
77
apt-key adv --keyserver keyserver.ubuntu.com --recv 86F44E2A && \
@@ -15,7 +15,7 @@ RUN echo "deb http://repos.mesosphere.io/ubuntu trusty main" > /etc/apt/sources.
1515
apt-get -y install curl mesos=${VERSION} && \
1616
rm -rf /var/lib/apt/lists/*
1717

18-
RUN curl -so /usr/bin/docker https://get.docker.com/builds/Linux/x86_64/docker-1.8.3 && chmod +x /usr/bin/docker
19-
18+
RUN curl -so /usr/bin/docker https://get.docker.com/builds/Linux/x86_64/docker-1.9.1 && chmod +x /usr/bin/docker
19+
2020
CMD ["--registry=in_memory"]
2121
ENTRYPOINT ["mesos-master"]

0 commit comments

Comments
 (0)