diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-08 12:23:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-08 12:23:31 +0000 |
| commit | 492ad93321f0ec7461d1661582520b8bc1ec9d00 (patch) | |
| tree | fb98e9df26049e9bcaec33d6b8115ce09af2f0f7 | |
| parent | c018ec691982b28e03234f3527e3338d5d9147e1 (diff) | |
| parent | 46ba928f648de37094b3030fac51da53ca099e23 (diff) | |
| download | kolla-492ad93321f0ec7461d1661582520b8bc1ec9d00.tar.gz kolla-492ad93321f0ec7461d1661582520b8bc1ec9d00.zip | |
Merge "Fix ubuntu marathon container"
| -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 %} |