Merge "R8 tag/path update"

diff --git a/cm-container/Dockerfile-template b/cm-container/Dockerfile-template
index 0beaa5f..b5ce5ab 100644 (file)
--- a/cm-container/Dockerfile-template
+++ b/cm-container/Dockerfile-template
@@ -1,5 +1,6 @@
 # ============LICENSE_START=======================================================
 # Copyright (c) 2018-2020 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2020 J. F. Lucas.  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.
@@ -21,12 +22,15 @@ ENV PLUGIN_REPO {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_re
 RUN mkdir scripts
 COPY scripts/* scripts/
 COPY reset_admin.py /opt/manager/
-# Load our plugin files
-# Setup rc.local to set up k8s credentials for CM
-RUN chmod +x /opt/manager/reset_admin.py\
-    && chmod +x scripts/*.sh\
+
+# Load plugins, set up TLS configuration, load Cloudify type file
+RUN chmod +x /opt/manager/reset_admin.py \
+    && chmod +x scripts/*.sh \
     && scripts/get-plugins.sh ${PLUGIN_REPO} \
-    && /scripts/configure-tls.sh
+    && /scripts/configure-tls.sh \
+    && mkdir /opt/manager/resources/spec/cloudify/4.5.5 \
+    && curl -Ss -L -f https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml > /opt/manager/resources/spec/cloudify/4.5.5/types.yaml \
+    && chown -R cfyuser:cfyuser /opt/manager/resources/spec/cloudify/4.5.5
 
 # Create mount point for CM config file
 RUN mkdir -p /opt/onap && chown cfyuser:cfyuser /opt/onap

diff --git a/cm-container/pom.xml b/cm-container/pom.xml
index b37a5ce..c39f5e4 100644 (file)
--- a/cm-container/pom.xml
+++ b/cm-container/pom.xml
@@ -27,7 +27,7 @@ limitations under the License.
   <groupId>org.onap.dcaegen2.deployments</groupId>
   <artifactId>cm-container</artifactId>
   <name>dcaegen2-deployments-cm-container</name>
-  <version>3.3.3</version>
+  <version>3.3.4</version>
   <url>http://maven.apache.org</url>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/releases/3.3.4-cm-container.yaml b/releases/3.3.4-cm-container.yaml
new file mode 100644 (file)
index 0000000..dd9d9ec
--- /dev/null
+++ b/releases/3.3.4-cm-container.yaml
@@ -0,0 +1,8 @@
+distribution_type: 'container'
+container_release_tag: '3.3.4'
+project: 'dcaegen2/deployments'
+log_dir: 'dcaegen2-deployments-master-merge-java/271'
+ref:  96a00ab0363cf3062eaf8ca11f506dc6a06cc1c0
+containers:
+  - name: 'org.onap.dcaegen2.deployments.cm-container'
+    version: '3.3.4-SNAPSHOT-20201006T130729Z'
\ No newline at end of file