summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXiaohua Zhang <xiaohua.zhang@windriver.com>2019-04-12 08:49:32 +0000
committerXiaohua Zhang <xiaohua.zhang@windriver.com>2019-04-12 08:50:35 +0000
commit64022697fffcce5211f06b408921c6360b7c8537 (patch)
treec5f007c05eeaf75bacc861a3fd66d32219cef1c8
parent0dd8bf5a0fa7d43fd3860927b7d2a7b68a6730ae (diff)
update stop scripts
Issue-ID: MULTICLOUD-508 Change-Id: I9ac055038f497b761cd5807c89551137fcc76d6c Signed-off-by: Xiaohua Zhang <xiaohua.zhang@windriver.com>
-rw-r--r--fcaps/docker/Dockerfile2
-rw-r--r--fcaps/stop.sh2
-rw-r--r--windriver/docker/Dockerfile2
3 files changed, 3 insertions, 3 deletions
diff --git a/fcaps/docker/Dockerfile b/fcaps/docker/Dockerfile
index 015c795a..408a6f99 100644
--- a/fcaps/docker/Dockerfile
+++ b/fcaps/docker/Dockerfile
@@ -27,7 +27,7 @@ RUN apk update && \
chmod +x /opt/fcaps/*.sh && \
rm -f multicloud-openstack-fcaps.zip && \
pip install -r /opt/fcaps/requirements.txt && \
- apk del -y wget unzip gcc make libc-dev libffi-dev openssl-dev && \
+ apk del wget unzip gcc make libc-dev libffi-dev openssl-dev && \
mkdir -p /var/log/onap/multicloud/fcaps && \
chown onap:onap /var/log/onap -R && \
chown onap:onap /opt/fcaps -R
diff --git a/fcaps/stop.sh b/fcaps/stop.sh
index b09ccb9f..d608abed 100644
--- a/fcaps/stop.sh
+++ b/fcaps/stop.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# Copyright (c) 2017-2019 Wind River Systems, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/windriver/docker/Dockerfile b/windriver/docker/Dockerfile
index cd58bd76..feddcb6e 100644
--- a/windriver/docker/Dockerfile
+++ b/windriver/docker/Dockerfile
@@ -27,7 +27,7 @@ RUN apk update && \
chmod +x /opt/windriver/*.sh && \
rm -f multicloud-openstack-windriver.zip && \
pip install -r /opt/windriver/requirements.txt && \
- apk del -y wget unzip gcc make libc-dev libffi-dev openssl-dev && \
+ apk del wget unzip gcc make libc-dev libffi-dev openssl-dev && \
mkdir -p /var/log/onap/multicloud/openstack/windriver && \
chown onap:onap /var/log/onap -R && \
chown onap:onap /opt/windriver -R