From c88f097daf1b2145a6941bdd0306f5baa50118af Mon Sep 17 00:00:00 2001 From: Taka Cho Date: Tue, 1 Sep 2020 13:13:02 -0400 Subject: add feature-controlloop-tdjam to drools-apps docker the feature-controlloop-tdjam will be installed in docker, but disable by default Issue-ID: POLICY-2415 Change-Id: I563a16bc698ce13eb1df0d8aa1cb7b7e7b8290b3 Signed-off-by: Taka Cho --- controlloop/packages/apps-controlloop/pom.xml | 8 +++++++- .../docker-controlloop/src/main/docker/Dockerfile | 22 ++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/controlloop/packages/apps-controlloop/pom.xml b/controlloop/packages/apps-controlloop/pom.xml index f7776b5a4..5d5821300 100644 --- a/controlloop/packages/apps-controlloop/pom.xml +++ b/controlloop/packages/apps-controlloop/pom.xml @@ -2,7 +2,7 @@ ============LICENSE_START======================================================= ONAP ================================================================================ - Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved. + Copyright (C) 2017-2020 AT&T Intellectual Property. All rights reserved. Modifications Copyright (C) 2019-2020 Bell Canada. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); @@ -101,6 +101,12 @@ ${project.version} zip + + org.onap.policy.drools-applications.controlloop.common + feature-controlloop-tdjam + ${project.version} + zip + diff --git a/controlloop/packages/docker-controlloop/src/main/docker/Dockerfile b/controlloop/packages/docker-controlloop/src/main/docker/Dockerfile index efb54b6e4..c36947dfa 100644 --- a/controlloop/packages/docker-controlloop/src/main/docker/Dockerfile +++ b/controlloop/packages/docker-controlloop/src/main/docker/Dockerfile @@ -1,3 +1,24 @@ +#------------------------------------------------------------------------------- +# Dockerfile +# ============LICENSE_START======================================================= +# Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. +# ================================================================================ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# ============LICENSE_END========================================================= +#------------------------------------------------------------------------------- + FROM onap/policy-drools:@version.policy.drools-pdp@ ARG BUILD_VERSION_APP_CL=${BUILD_VERSION_APP_CL} @@ -14,6 +35,7 @@ RUN unzip apps-controlloop.zip && \ $POLICY_HOME/bin/features install controlloop-utils controlloop-trans controlloop-management && \ $POLICY_HOME/bin/features install controlloop-frankfurt && \ $POLICY_HOME/bin/features install controlloop-usecases && \ + $POLICY_HOME/bin/features install controlloop-tdjam && \ $POLICY_HOME/bin/features enable healthcheck distributed-locking lifecycle && \ $POLICY_HOME/bin/features enable controlloop-trans controlloop-management && \ $POLICY_HOME/bin/features enable controlloop-frankfurt && \ -- cgit 1.2.3-korg