summaryrefslogtreecommitdiffstats
path: root/controlloop/packages
diff options
context:
space:
mode:
authorJim Hahn <jrh3@att.com>2020-03-13 15:25:26 +0000
committerGerrit Code Review <gerrit@onap.org>2020-03-13 15:25:26 +0000
commit47e0292e6eb7c0c1dba0f41276a5eb649a44a86c (patch)
tree67a9728198dbb68fc4155814e1128422ee4a4c07 /controlloop/packages
parentaa8225b5211485b3c1150c21e51fd3e93b7f31d3 (diff)
parent268ef0de1095a30c74a0ff8144cb49b157253658 (diff)
Merge "Delete template.demo submodule, amsterdam controller"
Diffstat (limited to 'controlloop/packages')
-rw-r--r--controlloop/packages/apps-controlloop/pom.xml6
-rw-r--r--controlloop/packages/docker-controlloop/src/main/docker/Dockerfile6
2 files changed, 4 insertions, 8 deletions
diff --git a/controlloop/packages/apps-controlloop/pom.xml b/controlloop/packages/apps-controlloop/pom.xml
index 0a78585df..895e66e10 100644
--- a/controlloop/packages/apps-controlloop/pom.xml
+++ b/controlloop/packages/apps-controlloop/pom.xml
@@ -91,12 +91,6 @@
</dependency>
<dependency>
<groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
- <artifactId>feature-controlloop-amsterdam</artifactId>
- <version>${project.version}</version>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
<artifactId>feature-controlloop-usecases</artifactId>
<version>${project.version}</version>
<type>zip</type>
diff --git a/controlloop/packages/docker-controlloop/src/main/docker/Dockerfile b/controlloop/packages/docker-controlloop/src/main/docker/Dockerfile
index 464720360..6c7c11433 100644
--- a/controlloop/packages/docker-controlloop/src/main/docker/Dockerfile
+++ b/controlloop/packages/docker-controlloop/src/main/docker/Dockerfile
@@ -12,14 +12,16 @@ RUN unzip apps-controlloop.zip && \
chmod 600 $POLICY_HOME/config/* && \
. $POLICY_HOME/etc/profile.d/env.sh && \
$POLICY_HOME/bin/features install controlloop-utils controlloop-trans controlloop-management && \
- $POLICY_HOME/bin/features install controlloop-amsterdam controlloop-usecases && \
+ $POLICY_HOME/bin/features install controlloop-frankfurt controlloop-usecases && \
$POLICY_HOME/bin/features enable healthcheck distributed-locking lifecycle && \
$POLICY_HOME/bin/features enable controlloop-trans controlloop-management && \
- $POLICY_HOME/bin/features enable controlloop-amsterdam controlloop-usecases && \
+ $POLICY_HOME/bin/features enable controlloop-frankfurt controlloop-usecases && \
$POLICY_HOME/bin/deploy-artifact -l -d -s $POLICY_HOME/etc/m2/standalone-settings.xml \
-a $POLICY_HOME/features/controlloop-management/lib/feature/feature-controlloop-management-$BUILD_VERSION_APP_CL.jar && \
$POLICY_HOME/bin/deploy-artifact -l -d -s $POLICY_HOME/etc/m2/standalone-settings.xml \
-a $POLICY_HOME/features/controlloop-usecases/artifacts/controller-usecases-$BUILD_VERSION_APP_CL.jar && \
+ $POLICY_HOME/bin/deploy-artifact -l -d -s $POLICY_HOME/etc/m2/standalone-settings.xml \
+ -a $POLICY_HOME/features/controlloop-frankfurt/artifacts/controller-frankfurt-$BUILD_VERSION_APP_CL.jar && \
find $HOME/.m2/ -name _maven.repositories -exec rm -v {} \; && \
find $HOME/.m2/ -name _remote.repositories -exec rm -v {} \; && \
rm $POLICY_INSTALL/apps-controlloop.zip $POLICY_INSTALL/basex-controlloop-$BUILD_VERSION_APP_CL.tar.gz 2> /dev/null