From 6be3c1abaf5c3eea0b353675835b6d2ce4584fe7 Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Mon, 12 Jul 2021 15:25:53 -0400 Subject: Delete extra simulator docker images The policy-models-simulator docker image, built from models-sim/packages, subsumes the functionality of the other simulator images. Deleted the other images. This simulator still needs some of the code from the dmaap-sim modules, so only deleted the code from the latter that is not needed by this simulator. Also modified the simulator launch script to use sh instead of bash. Issue-ID: POLICY-3474 Change-Id: Ie7f69b327a18c3e07f154124ae38975d5e6924f0 Signed-off-by: Jim Hahn --- .../packages/models-simulator-docker/src/main/docker/Dockerfile | 4 ++-- .../packages/models-simulator-docker/src/main/docker/simulators.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'models-sim/packages') 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 a4420b343..746f8f117 100644 --- a/models-sim/packages/models-simulator-docker/src/main/docker/Dockerfile +++ b/models-sim/packages/models-simulator-docker/src/main/docker/Dockerfile @@ -2,7 +2,7 @@ # ============LICENSE_START======================================================= # ONAP # ================================================================================ -# Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved. # Modifications Copyright (C) 2020 Bell Canada. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); @@ -57,4 +57,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..a2c2ec5f6 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,9 +1,9 @@ -#!/bin/bash +#!/bin/sh # # ============LICENSE_START======================================================= # ONAP # ================================================================================ -# Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved. # Modifications copyright (C) 2020 Bell Canada. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); -- cgit 1.2.3-korg