diff options
| author |   Jack Lucas <jflos@sonoris.net> | 2020-10-05 10:33:49 -0400 |
|---|---|---|
| committer | Jack Lucas <jflos@sonoris.net> | 2020-10-05 10:33:49 -0400 |
| commit | 96a00ab0363cf3062eaf8ca11f506dc6a06cc1c0 (patch) | |
| tree | e20b51b35948593a399d3db29286ff38cc0b1175 | |
| parent | dcada966cb18a3207b456d726c3b613a571a5fcb (diff) | |
Pre-load Cloudify 4.5.5 type files3.3.4
Issue-ID: DCAEGEN2-2471
Signed-off-by: Jack Lucas <jflos@sonoris.net>
Change-Id: I759cdf8e85bd62b6e7cac494b2e7c5b64722f17b
| -rw-r--r-- | cm-container/Dockerfile-template | 14 | ||||
| -rw-r--r-- | cm-container/pom.xml | 2 |
2 files changed, 10 insertions, 6 deletions
diff --git a/cm-container/Dockerfile-template b/cm-container/Dockerfile-template index 0beaa5f..b5ce5ab 100644 --- 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 --- 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> |