diff options
| author |   Jack Lucas <jflucas@research.att.com> | 2019-03-22 18:31:55 -0400 |
|---|---|---|
| committer | Jack Lucas <jflucas@research.att.com> | 2019-03-22 18:46:13 -0400 |
| commit | 205fc2e449f9bcc2f447c58d2bd15e9b563237d3 (patch) | |
| tree | 97eabcf3e5252130b9626d29643084961c1602ea /cm-container/Dockerfile-template | |
| parent | 4c67277a504a8c2c200e6fe63c7218759620a1ec (diff) | |
Fix support for local type file storage
Also move to script-based readiness check so that the import resolver
rule updated needed for local type file storage takes effect before
clients try to use CM, and to verify that all CM services are really up.
Issue-ID: DCAEGEN2-989
Change-Id: I9732fa0ff38affa320b6a872b74c16f87b73eb67
Signed-off-by: Jack Lucas <jflucas@research.att.com>
Diffstat (limited to 'cm-container/Dockerfile-template')
| -rw-r--r-- | cm-container/Dockerfile-template | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cm-container/Dockerfile-template b/cm-container/Dockerfile-template index 9462ff5..8524ee8 100644 --- a/cm-container/Dockerfile-template +++ b/cm-container/Dockerfile-template @@ -1,7 +1,7 @@ # ============LICENSE_START======================================================= # org.onap.dcae # ================================================================================ -# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. +# Copyright (c) 2018-2019 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. @@ -25,7 +25,7 @@ ENV CCSDK_REPO {{ ONAPTEMPLATE_RAWREPOURL_org_onap_ccsdk_platform_plugins_releas # Store type files locally RUN mkdir scripts -COPY get-type-files.sh dcae-cleanup.sh start-persistent.sh setup-secret.sh scripts/ +COPY scripts/* scripts/ # Load our type files and the Cloudify 3.4 type files # Setup rc.local to set up k8s credentials for CM RUN scripts/get-type-files.sh ${TYPE_REPO} ${CCSDK_REPO}\ @@ -34,6 +34,7 @@ RUN scripts/get-type-files.sh ${TYPE_REPO} ${CCSDK_REPO}\ && chown -R cfyuser:cfyuser /opt/manager/resources/spec/cloudify/3.4\ && chmod +x scripts/*.sh\ && echo "/scripts/setup-secret.sh" >> /etc/rc.d/rc.local\ + && echo "/scripts/set-resolver-rules.sh" >> /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 |