Parameterize base-image version for drools-apps

[policy/drools-applications.git] / controlloop / packages / docker-controlloop / src / main / docker / Dockerfile

diff --git a/controlloop/packages/docker-controlloop/src/main/docker/Dockerfile b/controlloop/packages/docker-controlloop/src/main/docker/Dockerfile
index 49d036a..98bf35a 100644 (file)
--- a/controlloop/packages/docker-controlloop/src/main/docker/Dockerfile
+++ b/controlloop/packages/docker-controlloop/src/main/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM onap/policy-drools:1.6-SNAPSHOT-latest
+FROM onap/policy-drools:@version.policy.drools-pdp@
 
 ARG BUILD_VERSION_APP_CL=${BUILD_VERSION_APP_CL}
 ENV BUILD_VERSION_APP_CL=${BUILD_VERSION_APP_CL}
@@ -19,16 +19,18 @@ RUN unzip apps-controlloop.zip && \
 COPY /maven/docker-entrypoint.sh $POLICY_HOME/bin/
 
 RUN . $POLICY_HOME/etc/profile.d/env.sh && \
-    mvn org.apache.maven.plugins:maven-dependency-plugin:3.1.1:get \
-        --settings=$POLICY_HOME/etc/m2/standalone-settings.xml \
-        -DartifactId=feature-controlloop-management \
-        -DgroupId=org.onap.policy.drools-applications.controlloop.common -Dversion=$BUILD_VERSION_APP_CL && \
     $POLICY_HOME/bin/features install healthcheck distributed-locking lifecycle && \
     $POLICY_HOME/bin/features install controlloop-utils controlloop-trans controlloop-management && \
     $POLICY_HOME/bin/features install controlloop-amsterdam 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/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 && \
+    find $HOME/.m2/ -name _maven.repositories -exec rm -v {} \; && \
+    find $HOME/.m2/ -name _remote.repositories -exec rm -v {} \; && \
     rm $POLICY_INSTALL/*.zip $POLICY_INSTALL/*.gz 2> /dev/null
 
 ENTRYPOINT ["/opt/app/policy/bin/docker-entrypoint.sh"]