openstack
/
kolla
Code Issues Proposed changes

Merge "monasca-thresh: drop special handling for Ubuntu"

This commit is contained in:
Zuul 2022-04-22 11:18:32 +00:00 committed by Gerrit Code Review
parent b8493da8ad 6423fb5e1b
commit daaea83378
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker/monasca/monasca-thresh/Dockerfile.j2
View File

@ -42,12 +42,6 @@ ADD additions/monasca-common* /monasca-common-source
{% set build_opts = ['-DskipTests'] %}
# FIXME(dszumski): Remove this when the following bug is fixed:
# https://bugs.launchpad.net/ubuntu/+source/ca-certificates-java/+bug/1770553
{% if base_distro == 'ubuntu' %}
{% set build_opts = build_opts + ['-Djavax.net.ssl.trustStorePassword=changeit'] %}
{% endif %}
RUN cd /monasca-common-source/java \
&& mvn clean install {{ build_opts|join(' ') }} \
&& cd /monasca-thresh-source/monasca-thresh-*/thresh \