Skip to content

Bump mesos version to 1.9.0 #2115

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

Merged
ssalinas merged 1 commit into from
Jul 17, 2020
Merged

Bump mesos version to 1.9.0 #2115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions SingularityExecutor/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ ENV JAVA_SHA d54c1d3a095b4ff2b6607d096fa80163
RUN apt-get update && \
apt-get install -y curl tar logrotate ca-certificates apt-transport-https lxc iptables && \
apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D && \
echo "deb https://apt.dockerproject.org/repo ubuntu-trusty main" > /etc/apt/sources.list.d/docker.list && \
echo "deb https://download.docker.com/linux/ubuntu xenial stable" > /etc/apt/sources.list.d/docker.list && \
apt-get update && \
apt-get -y install docker-engine && \
apt-get -y install docker.io && \
curl -skLOH "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie" \
http://download.oracle.com/otn-pub/java/jdk/${JAVA_VERSION_MAJOR}u${JAVA_VERSION_MINOR}-b${JAVA_VERSION_BUILD}/${JAVA_SHA}/${JAVA_PACKAGE}-${JAVA_VERSION_MAJOR}u${JAVA_VERSION_MINOR}-linux-x64.tar.gz && \
gunzip ${JAVA_PACKAGE}-${JAVA_VERSION_MAJOR}u${JAVA_VERSION_MINOR}-linux-x64.tar.gz && \
Expand Down
2 changes: 1 addition & 1 deletion SingularityExecutor/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@
<configuration>
<images>
<image>
<name>hubspot/singularityexecutorslave:${project.version}</name>
<name>hubspot/singularityexecutoragent:${project.version}</name>
<build>
<from>hubspot/singularitybase:${mesos.docker.tag}-${singularitybase.image.revision}</from>
<maintainer>platform-infrastructure-groups@hubspot.com</maintainer>
Expand Down
44 changes: 22 additions & 22 deletions SingularityServiceIntegrationTests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@
</activation>
<properties>
<mesos.master.hostname>singularity-test-master</mesos.master.hostname>
<mesos.slave1.hostname>singularity-test-slave1</mesos.slave1.hostname>
<mesos.slave2.hostname>singularity-test-slave2</mesos.slave2.hostname>
<mesos.slave3.hostname>singularity-test-slave3</mesos.slave3.hostname>
<mesos.agent1.hostname>singularity-test-agent1</mesos.agent1.hostname>
<mesos.agent2.hostname>singularity-test-agent2</mesos.agent2.hostname>
<mesos.agent3.hostname>singularity-test-agent3</mesos.agent3.hostname>
</properties>
<build>
<plugins>
Expand All @@ -91,9 +91,9 @@
Maven, you little sneaky beast ... -->
<zk.port>${zk.port}</zk.port>
<mesos.master.port>${mesos.master.port}</mesos.master.port>
<mesos.slave1.port>${mesos.slave.1.port}</mesos.slave1.port>
<mesos.slave2.port>${mesos.slave.2.port}</mesos.slave2.port>
<mesos.slave3.port>${mesos.slave.3.port}</mesos.slave3.port>
<mesos.agent1.port>${mesos.agent.1.port}</mesos.agent1.port>
<mesos.agent2.port>${mesos.agent.2.port}</mesos.agent2.port>
<mesos.agent3.port>${mesos.agent.3.port}</mesos.agent3.port>
<singularity.port>${singularity.port}</singularity.port>
</systemPropertyVariables>
</configuration>
Expand Down Expand Up @@ -132,7 +132,7 @@
</run>
</image>
<image>
<name>mesosphere/mesos-master:${mesos.docker.tag}</name>
<name>hubspot/mesos-master:${mesos.docker.tag}</name>
<alias>singularity-test-master</alias>
<run>
<namingStrategy>alias</namingStrategy>
Expand All @@ -156,8 +156,8 @@
</run>
</image>
<image>
<name>hubspot/singularityexecutorslave:${project.version}</name>
<alias>singularity-test-slave1</alias>
<name>hubspot/singularityexecutoragent:${project.version}</name>
<alias>singularity-test-agent1</alias>
<run>
<namingStrategy>alias</namingStrategy>
<privileged>true</privileged>
Expand All @@ -166,13 +166,13 @@
<link>singularity-test-master</link>
</links>
<ports>
<port>mesos.slave1.port:5051</port>
<port>mesos.agent1.port:5051</port>
</ports>
<env>
<MESOS_MASTER>zk://singularity-test-zk:2181/mesos</MESOS_MASTER>
<MESOS_CONTAINERIZERS>docker,mesos</MESOS_CONTAINERIZERS>
<MESOS_LAUNCHER>posix</MESOS_LAUNCHER>
<MESOS_HOSTNAME>${mesos.slave1.hostname}</MESOS_HOSTNAME>
<MESOS_HOSTNAME>${mesos.agent1.hostname}</MESOS_HOSTNAME>
<MESOS_PORT>5051</MESOS_PORT>
<MESOS_ATTRIBUTES>rackid:a</MESOS_ATTRIBUTES>
</env>
Expand All @@ -189,8 +189,8 @@
</run>
</image>
<image>
<name>hubspot/singularityexecutorslave:${project.version}</name>
<alias>singularity-test-slave2</alias>
<name>hubspot/singularityexecutoragent:${project.version}</name>
<alias>singularity-test-agent2</alias>
<run>
<namingStrategy>alias</namingStrategy>
<privileged>true</privileged>
Expand All @@ -199,13 +199,13 @@
<link>singularity-test-master</link>
</links>
<ports>
<port>mesos.slave2.port:5051</port>
<port>mesos.agent2.port:5051</port>
</ports>
<env>
<MESOS_MASTER>zk://singularity-test-zk:2181/mesos</MESOS_MASTER>
<MESOS_CONTAINERIZERS>docker,mesos</MESOS_CONTAINERIZERS>
<MESOS_LAUNCHER>posix</MESOS_LAUNCHER>
<MESOS_HOSTNAME>${mesos.slave2.hostname}</MESOS_HOSTNAME>
<MESOS_HOSTNAME>${mesos.agent2.hostname}</MESOS_HOSTNAME>
<MESOS_PORT>5051</MESOS_PORT>
<MESOS_ATTRIBUTES>rackid:b</MESOS_ATTRIBUTES>
</env>
Expand All @@ -222,8 +222,8 @@
</run>
</image>
<image>
<name>hubspot/singularityexecutorslave:${project.version}</name>
<alias>singularity-test-slave3</alias>
<name>hubspot/singularityexecutoragent:${project.version}</name>
<alias>singularity-test-agent3</alias>
<run>
<namingStrategy>alias</namingStrategy>
<privileged>true</privileged>
Expand All @@ -232,13 +232,13 @@
<link>singularity-test-master</link>
</links>
<ports>
<port>mesos.slave3.port:5051</port>
<port>mesos.agent3.port:5051</port>
</ports>
<env>
<MESOS_MASTER>zk://singularity-test-zk:2181/mesos</MESOS_MASTER>
<MESOS_CONTAINERIZERS>docker,mesos</MESOS_CONTAINERIZERS>
<MESOS_LAUNCHER>posix</MESOS_LAUNCHER>
<MESOS_HOSTNAME>${mesos.slave3.hostname}</MESOS_HOSTNAME>
<MESOS_HOSTNAME>${mesos.agent3.hostname}</MESOS_HOSTNAME>
<MESOS_PORT>5051</MESOS_PORT>
<MESOS_ATTRIBUTES>rackid:c</MESOS_ATTRIBUTES>
</env>
Expand Down Expand Up @@ -293,9 +293,9 @@
<links>
<link>singularity-test-zk</link>
<link>singularity-test-master</link>
<link>singularity-test-slave1</link>
<link>singularity-test-slave2</link>
<link>singularity-test-slave3</link>
<link>singularity-test-agent1</link>
<link>singularity-test-agent2</link>
<link>singularity-test-agent3</link>
<link>singularity-mysql</link>
<link>singularity-mailhog</link>
</links>
Expand Down
4 changes: 2 additions & 2 deletions compose-dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ zk:
ZK_ID: 1

master:
image: mesosphere/mesos-master:1.7.1
image: hubspot/mesos-master:1.9.0
net: host
environment:
MESOS_ZK: zk://localhost:2181/mesos
Expand All @@ -18,7 +18,7 @@ master:
MESOS_ROLES: "OPS"

slave:
image: hubspot/singularityexecutorslave:1.3.0-SNAPSHOT
image: hubspot/singularityexecutoragent:1.3.0-SNAPSHOT
command: mesos-slave
net: host
environment:
Expand Down
7 changes: 7 additions & 0 deletions docker-mesos/mesos-agent/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
FROM hubspot/mesos:1.9.0

MAINTAINER platform-infrastructure-groups@hubspot.com

ENTRYPOINT ["mesos-slave"]

# to build - docker build -t hubspot/mesos-agent:1.9.0 .
8 changes: 8 additions & 0 deletions docker-mesos/mesos-master/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
FROM hubspot/mesos:1.9.0

MAINTAINER platform-infrastructure-groups@hubspot.com

CMD ["--registry=in_memory"]
ENTRYPOINT ["mesos-master"]

# to build - docker build -t hubspot/mesos-master:1.9.0 .
12 changes: 12 additions & 0 deletions docker-mesos/mesos/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
FROM ubuntu:xenial

MAINTAINER platform-infrastructure-groups@hubspot.com

RUN apt-get update && \
echo "deb http://repos.mesosphere.com/ubuntu xenial main" > /etc/apt/sources.list.d/mesosphere.list && \
apt-get -y update && \
apt-get -y --allow-unauthenticated install mesos="1.9.0-2.0.1.ubuntu1604" && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*

# to build - docker build -t hubspot/mesos:1.9.0 .
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@
<dropwizard.guicier.version>1.3.5.1</dropwizard.guicier.version>
<dropwizard.version>1.3.12</dropwizard.version>
<horizon.version>0.1.2</horizon.version>
<mesos.docker.tag>1.7.1</mesos.docker.tag> <!-- 1.8.0 not available yet, still compatible -->
<mesos.version>1.8.0</mesos.version>
<mesos.docker.tag>1.9.0</mesos.docker.tag> <!-- 1.10.0 not available yet, still compatible -->
<mesos.version>1.10.0</mesos.version>
<ning.async.version>1.9.38</ning.async.version>
<singularity.jar.name.format>${project.artifactId}-${project.version}</singularity.jar.name.format>
<singularitybase.db.driver>mysql</singularitybase.db.driver>
Expand Down