From 0ee2d997a118b4239c1a9d05fc3fd98028d0ba35 Mon Sep 17 00:00:00 2001 From: liamfallon Date: Wed, 13 Jul 2022 13:38:22 +0100 Subject: Change scripts to sh rather than bash The models simulator in Honolulu uses bash for running scripts but bash is not available in the alpine base image. This commit replaces bash with sh Issue-ID: POLICY-4233 Change-Id: I2cdab931257d6686c693d307c5eb742a896b0d08 Signed-off-by: liamfallon --- models-sim/packages/models-simulator-docker/src/main/docker/Dockerfile | 3 ++- .../packages/models-simulator-docker/src/main/docker/simulators.sh | 3 ++- .../policy-models-simulators/src/main/package/docker/simulators.sh | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/models-sim/packages/models-simulator-docker/src/main/docker/Dockerfile b/models-sim/packages/models-simulator-docker/src/main/docker/Dockerfile index e71df4549..9a524fb36 100644 --- a/models-sim/packages/models-simulator-docker/src/main/docker/Dockerfile +++ b/models-sim/packages/models-simulator-docker/src/main/docker/Dockerfile @@ -4,6 +4,7 @@ # ================================================================================ # Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. # Modifications Copyright (C) 2020 Bell Canada. All rights reserved. +# Modification Copyright (C) 2022 Nordix Foundation. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -57,4 +58,4 @@ RUN find /opt/app -type d -perm 755 \ USER policy:policy ENV PATH ${POLICY_HOME}/simulators/bin:$PATH -ENTRYPOINT [ "bash", "simulators.sh" ] +ENTRYPOINT [ "simulators.sh" ] diff --git a/models-sim/packages/models-simulator-docker/src/main/docker/simulators.sh b/models-sim/packages/models-simulator-docker/src/main/docker/simulators.sh index 1cec646de..a70deb9fc 100644 --- a/models-sim/packages/models-simulator-docker/src/main/docker/simulators.sh +++ b/models-sim/packages/models-simulator-docker/src/main/docker/simulators.sh @@ -1,10 +1,11 @@ -#!/bin/bash +#!/bin/sh # # ============LICENSE_START======================================================= # ONAP # ================================================================================ # Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. # Modifications copyright (C) 2020 Bell Canada. All rights reserved. +# Modifications Copyright (C) 2022 Nordix Foundation. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/models-sim/policy-models-simulators/src/main/package/docker/simulators.sh b/models-sim/policy-models-simulators/src/main/package/docker/simulators.sh index 7e38f374c..01521cbf9 100644 --- a/models-sim/policy-models-simulators/src/main/package/docker/simulators.sh +++ b/models-sim/policy-models-simulators/src/main/package/docker/simulators.sh @@ -1,10 +1,11 @@ -#!/bin/bash +#!/bin/sh # # ============LICENSE_START======================================================= # ONAP # ================================================================================ # Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. # Modifications copyright (C) 2020 Bell Canada. All rights reserved. +# Modifications Copyright (C) 2022 Nordix Foundation. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. -- cgit 1.2.3-korg