Skip to content
This repository was archived by the owner on Oct 23, 2024. It is now read-only.

Commit 32aed06

Browse files
author
Tim Harper
authored
Upgrade Dockerfile to use Debian Stretch for 1.5.x (#6635)
JIRA Issues: MARATHON-8487
1 parent 128d53a commit 32aed06

2 files changed

Lines changed: 15 additions & 7 deletions

File tree

build.sbt

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ lazy val packagingSettings = Seq(
184184
daemonUser in Docker := "nobody",
185185
daemonGroup in Docker := "nogroup",
186186
version in Docker := { "v" + (version in Compile).value },
187-
dockerBaseImage := "debian:jessie-slim",
187+
dockerBaseImage := "debian:stretch-slim",
188188
(defaultLinuxInstallLocation in Docker) := "/marathon",
189189
dockerCommands := {
190190
// kind of a work-around; we need our chown /marathon command to come after the WORKDIR command, and installation
@@ -193,20 +193,24 @@ lazy val packagingSettings = Seq(
193193

194194
prefixCommands ++
195195
Seq(Cmd("RUN",
196-
s"""apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv DF7D54CBE56151BF && \\
196+
s"""apt-get update && apt-get install -my wget gnupg && \\
197+
|apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv DF7D54CBE56151BF && \\
197198
|apt-get update -y && \\
198199
|apt-get upgrade -y && \\
199-
|echo "deb http://ftp.debian.org/debian jessie-backports main" | tee -a /etc/apt/sources.list && \\
200-
|echo "deb http://repos.mesosphere.com/debian jessie-testing main" | tee -a /etc/apt/sources.list.d/mesosphere.list && \\
201-
|echo "deb http://repos.mesosphere.com/debian jessie main" | tee -a /etc/apt/sources.list.d/mesosphere.list && \\
200+
|echo "deb http://ftp.debian.org/debian stretch-backports main" | tee -a /etc/apt/sources.list && \\
201+
|echo "deb http://repos.mesosphere.com/debian stretch-testing main" | tee -a /etc/apt/sources.list.d/mesosphere.list && \\
202+
|echo "deb http://repos.mesosphere.com/debian stretch main" | tee -a /etc/apt/sources.list.d/mesosphere.list && \\
202203
|apt-get update && \\
203204
|
204205
|# jdk setup
205206
|mkdir -p /usr/share/man/man1 && \\
206-
|apt-get install -y openjdk-8-jdk-headless openjdk-8-jre-headless ca-certificates-java=20161107~bpo8+1 && \\
207+
|apt-get install -y openjdk-8-jdk-headless openjdk-8-jre-headless ca-certificates-java=20170531+nmu1 && \\
207208
|/var/lib/dpkg/info/ca-certificates-java.postinst configure && \\
208209
|ln -svT "/usr/lib/jvm/java-8-openjdk-$$(dpkg --print-architecture)" /docker-java-home && \\
209-
|
210+
|# mesos setup
211+
|echo exit 0 > /usr/bin/systemctl && chmod +x /usr/bin/systemctl && \\
212+
|# Workaround required due to https://github.com/mesosphere/mesos-deb-packaging/issues/102
213+
|apt-get install -y libcurl3-nss && \\
210214
|apt-get install --no-install-recommends -y --force-yes mesos=${Dependency.V.MesosDebian} && \\
211215
|apt-get clean && \\
212216
|chown nobody:nogroup /marathon""".stripMargin)) ++

changelog.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ For more information, refer to the [framework id docs page](https://mesosphere.g
1919

2020
Previously, the Marathon Docker container would only run as user root. The packaging has been updated so that the container can be run as the user `nobody`. The default user for running the container (and, subsequently, the default value for `--mesos_user`) has not been changed.
2121

22+
### Docker image upgraded to Debian Stretch
23+
24+
The Docker image for Marathon now uses Debian Stretch as a base OS, since Debian Jessie is no longer receiving security updates.
25+
2226
### Native Packages
2327

2428
We have stopped publishing native packages for operating system versions that are past their end-of-life:

0 commit comments

Comments
 (0)