diff options
| author |   Jack Lucas <jflucas@research.att.com> | 2020-05-18 18:23:38 -0400 |
|---|---|---|
| committer | Jack Lucas <jflucas@research.att.com> | 2020-06-12 09:39:23 -0400 |
| commit | ec3410a8478bedba8a06efb02f1610c2ebfdf130 (patch) | |
| tree | 59b8a007f1d76fc1b3a8eadc36825a5f28e1201d /cm-container/Dockerfile-template | |
| parent | a774ad9f309576a61db9689f5315f2577e507b25 (diff) | |
Move plugin upload to CM container
Issue-ID: DCAEGEN2-2236
Issue-ID: DCAEGEN2-1789
Signed-off-by: Jack Lucas <jflucas@research.att.com>
Change-Id: Ibc4612dedbf73a17a237b88abe198add391b82de
Diffstat (limited to 'cm-container/Dockerfile-template')
| -rw-r--r-- | cm-container/Dockerfile-template | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/cm-container/Dockerfile-template b/cm-container/Dockerfile-template index b392e92..5e6d846 100644 --- a/cm-container/Dockerfile-template +++ b/cm-container/Dockerfile-template @@ -1,7 +1,5 @@ # ============LICENSE_START======================================================= -# org.onap.dcae -# ================================================================================ -# Copyright (c) 2018-2019 AT&T Intellectual Property. All rights reserved. +# Copyright (c) 2018-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. @@ -15,27 +13,20 @@ # See the License for the specific language governing permissions and # limitations under the License. # ============LICENSE_END========================================================= -# -# ECOMP is a trademark and service mark of AT&T Intellectual Property. FROM cloudifyplatform/community:19.01.24 -MAINTAINER maintainer -ENV TYPE_REPO {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }} -ENV CCSDK_REPO {{ ONAPTEMPLATE_RAWREPOURL_org_onap_ccsdk_platform_plugins_releases }} +ENV PLUGIN_REPO {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }} -# Store type files locally +# Store plugin files locally RUN mkdir scripts COPY scripts/* scripts/ -# Load our type files and the Cloudify 3.4 type files +# Load our plugin files # Setup rc.local to set up k8s credentials for CM -RUN scripts/get-type-files.sh ${TYPE_REPO} ${CCSDK_REPO}\ - && mkdir /opt/manager/resources/spec/cloudify/3.4\ - && curl -Ss -L -f https://getcloudify.org/spec/cloudify/3.4/types.yaml > /opt/manager/resources/spec/cloudify/3.4/types.yaml\ - && chown -R cfyuser:cfyuser /opt/manager/resources/spec/cloudify/3.4\ +RUN scripts/get-plugins.sh ${PLUGIN_REPO} \ && chmod +x scripts/*.sh\ && /scripts/configure-tls.sh\ && echo "/scripts/setup-secret.sh" >> /etc/rc.d/rc.local\ - && echo "/scripts/set-resolver-rules.sh" >> /etc/rc.d/rc.local\ + && echo "/scripts/load-plugins.sh > /load-plugins.log 2>&1" >> /etc/rc.d/rc.local\ && chmod +x /etc/rc.d/rc.local # Create mount point for CM config file RUN mkdir -p /opt/onap && chown cfyuser:cfyuser /opt/onap |