diff options
| author | Artur Zarzycki <azarzycki@mirantis.com> | 2016-03-03 22:42:54 +0100 |
|---|---|---|
| committer | Artur Zarzycki <azarzycki@mirantis.com> | 2016-03-08 10:11:55 +0100 |
| commit | 46ba928f648de37094b3030fac51da53ca099e23 (patch) | |
| tree | 0422eaac279189d4b32afd26ad8ed1c9425dde6d | |
| parent | 67c71ff5511639373856bff13b206aef4955e17e (diff) | |
| download | kolla-46ba928f648de37094b3030fac51da53ca099e23.tar.gz kolla-46ba928f648de37094b3030fac51da53ca099e23.zip | |
Fix ubuntu marathon container
When we install mesos if it(or some deps) doesn't find java it installs
gcj(java5) which generate cacerts, so later in marathon we have
situation that openjdk8 can't access(discover as broken) to it because
of different format. Additionaly this third-party openjdk8 has in
dependencies ca-certificates-java which need java to generate cacerts
file.
Change-Id: Ic4467529a842ffc4bdd99ac1e23abbdee3a82422
Closes-bug: #1552626
| -rw-r--r-- | docker/marathon/Dockerfile.j2 | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/docker/marathon/Dockerfile.j2 b/docker/marathon/Dockerfile.j2 index ba289ec11..0c23ed3df 100644 --- a/docker/marathon/Dockerfile.j2 +++ b/docker/marathon/Dockerfile.j2 @@ -33,9 +33,16 @@ RUN equivs-build java8-runtime-headless \ && dpkg -i java8-runtime-headless_42_all.deb \ && rm java8-runtime-headless java8-runtime-headless_42_all.deb +# NOTE(ajafo) Installation of Marathon/OpenJDK breaks cacerts file, +# so the ca-certificates-java package is purged +# and installed again as a workaround for this problem. + RUN apt-get install -y --no-install-recommends \ marathon \ openjdk-8-jre-headless \ + && dpkg --purge --force-depends ca-certificates-java \ + && apt-get install -y --no-install-recommends \ + ca-certificates-java \ && apt-get clean {% endif %} |