From 45cb899800a171a398238665009af73927969db0 Mon Sep 17 00:00:00 2001 From: Jack Lucas Date: Wed, 22 Aug 2018 19:29:40 +0000 Subject: Update CM to 18.7.23 Issue-ID: DCAEGEN2-619 Change-Id: I8140061d9358a99f2e13bb78facb15dbc77229a7 Signed-off-by: Jack Lucas --- cm-container/Dockerfile-template | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'cm-container/Dockerfile-template') diff --git a/cm-container/Dockerfile-template b/cm-container/Dockerfile-template index 2c67d51..5c052a0 100644 --- a/cm-container/Dockerfile-template +++ b/cm-container/Dockerfile-template @@ -17,7 +17,7 @@ # ============LICENSE_END========================================================= # # ECOMP is a trademark and service mark of AT&T Intellectual Property. -FROM cloudifyplatform/community:cloudify-manager-18.2.28 +FROM cloudifyplatform/community:18.7.23 MAINTAINER maintainer ENV TYPE_REPO {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }} @@ -25,12 +25,13 @@ ENV CCSDK_REPO {{ ONAPTEMPLATE_RAWREPOURL_org_onap_ccsdk_platform_plugins_releas # Store type files locally RUN mkdir scripts -COPY get-type-files.sh scripts +COPY get-type-files.sh dcae-cleanup.sh scripts/ # Load our type files and the Cloudify 3.4 type files RUN scripts/get-type-files.sh ${TYPE_REPO} ${CCSDK_REPO}\ && mkdir /opt/manager/resources/spec/cloudify/3.4\ && curl -Ss https://cloudify.co/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 + && chown -R cfyuser:cfyuser /opt/manager/resources/spec/cloudify/3.4\ + && chmod +x scripts/*.sh # Create mount point for CM config file RUN mkdir -p /opt/onap && chown cfyuser:cfyuser /opt/onap @@ -38,6 +39,10 @@ RUN mkdir -p /opt/onap && chown cfyuser:cfyuser /opt/onap # Install python development-related packages RUN yum install -y gcc python-devel python-virtualenv python-pip +# Install jq (used for cleanup--parsing output of CM API call) +RUN curl -Ss -L "https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64" > /bin/jq \ +&& chmod +x /bin/jq + # Set up virtualenv and install Cloudify CLI 4.2 RUN pip install --upgrade pip==9.0.3 \ && virtualenv cfy42 \ -- cgit 1.2.3-korg