diff options
author | Jack Lucas <jflucas@research.att.com> | 2019-07-24 17:45:01 -0400 |
---|---|---|
committer | Jack Lucas <jflucas@research.att.com> | 2019-07-24 18:53:03 -0400 |
commit | ffb4c7176c449c96a4bdbb43aa5a0c86e0aafdd4 (patch) | |
tree | e220469831d4c447707e439f8ef5109943965705 /cm-container/Dockerfile-template | |
parent | 567e399803a759e40c6a7d378bb517da4c5cd556 (diff) |
Fix bad types file download
Use the curl -L option to follow redirects
and the -f option to cause curl to fail
(and stop the Docker image build) if it
does not successfully retrieve a file
Issue-ID: DCAEGEN2-1685
Change-Id: If8fd872e036ed5bc48656f8ca6853c297c6ac135
Signed-off-by: Jack Lucas <jflucas@research.att.com>
Diffstat (limited to 'cm-container/Dockerfile-template')
-rw-r--r-- | cm-container/Dockerfile-template | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cm-container/Dockerfile-template b/cm-container/Dockerfile-template index 90835cc..b392e92 100644 --- a/cm-container/Dockerfile-template +++ b/cm-container/Dockerfile-template @@ -30,7 +30,7 @@ COPY scripts/* scripts/ # 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 https://cloudify.co/spec/cloudify/3.4/types.yaml > /opt/manager/resources/spec/cloudify/3.4/types.yaml\ + && 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\ && chmod +x scripts/*.sh\ && /scripts/configure-tls.sh\ @@ -41,7 +41,7 @@ RUN scripts/get-type-files.sh ${TYPE_REPO} ${CCSDK_REPO}\ RUN mkdir -p /opt/onap && chown cfyuser:cfyuser /opt/onap # 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 \ +RUN curl -Ss -L -f "https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64" > /bin/jq \ && chmod +x /bin/jq CMD ["/scripts/start-persistent.sh"] |