openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fix ubuntu marathon container"

Browse Source
This commit is contained in:
Jenkins 2016-03-08 12:23:31 +00:00 committed by Gerrit Code Review
commit 492ad93321
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docker/marathon/Dockerfile.j2
View File

@ -33,9 +33,16 @@ RUN equivs-build java8-runtime-headless \
&& dpkg -i java8-runtime-headless_42_all.deb \ && dpkg -i java8-runtime-headless_42_all.deb \
&& rm java8-runtime-headless 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 \ RUN apt-get install -y --no-install-recommends \
marathon \ marathon \
openjdk-8-jre-headless \ openjdk-8-jre-headless \
&& dpkg --purge --force-depends ca-certificates-java \
&& apt-get install -y --no-install-recommends \
ca-certificates-java \
&& apt-get clean && apt-get clean
{% endif %} {% endif %}