diff options
| author | Zuul <zuul@review.opendev.org> | 2022-04-22 11:18:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-04-22 11:18:32 +0000 |
| commit | daaea83378c825db203a54139b036fc7243e5bb8 (patch) | |
| tree | eeaf0df4604460b5acf0f90fe0b166c04249faa5 | |
| parent | b8493da8ad70c2772fe558addd6611e7f8dfcacd (diff) | |
| parent | 6423fb5e1bc80e743e91d560518094ccd5f55b9b (diff) | |
| download | kolla-daaea83378c825db203a54139b036fc7243e5bb8.tar.gz kolla-daaea83378c825db203a54139b036fc7243e5bb8.zip | |
Merge "monasca-thresh: drop special handling for Ubuntu"
| -rw-r--r-- | docker/monasca/monasca-thresh/Dockerfile.j2 | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/docker/monasca/monasca-thresh/Dockerfile.j2 b/docker/monasca/monasca-thresh/Dockerfile.j2 index 0eda96aee..a41692d08 100644 --- a/docker/monasca/monasca-thresh/Dockerfile.j2 +++ b/docker/monasca/monasca-thresh/Dockerfile.j2 @@ -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 \ |