From 6423fb5e1bc80e743e91d560518094ccd5f55b9b Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 21 Apr 2022 18:01:24 +0200 Subject: monasca-thresh: drop special handling for Ubuntu Bug mentioned in Dockerfile was fixed about 4 years ago. Change-Id: I6d90e6673b01756e7de7c8eeb29423cee0cce6f7 --- docker/monasca/monasca-thresh/Dockerfile.j2 | 6 ------ 1 file changed, 6 deletions(-) (limited to 'docker') 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 \ -- cgit v1.2.3