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 <jrh3@att.com>

3 files changed, 0 insertions, 178 deletions

diff --git a/models-sim/models-sim-dmaap/src/main/package/docker/Dockerfile b/models-sim/models-sim-dmaap/src/main/package/docker/Dockerfile
deleted file mode 100644
index 495924d5b..000000000
--- a/models-sim/models-sim-dmaap/src/main/package/docker/Dockerfile
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# ============LICENSE_START=======================================================
-#  Copyright (C) 2019 Nordix Foundation.
-#  Modifications Copyright (C) 2019 AT&T Intellectual Property.
-# ================================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-# ============LICENSE_END=========================================================
-#
-
-#
-# Docker file to build an image that runs the DMaaP simulator on Java 8 in alpine
-#
-
-FROM onap/policy-jre-alpine
-
-LABEL maintainer="Policy Team"
-
-ARG POLICY_LOGS=/var/log/onap/policy/dmaap-sim
-
-ENV POLICY_HOME=/opt/app/policy
-ENV POLICY_LOGS=${POLICY_LOGS}
-
-# Create DMaaP simulator user and group
-# Add simulator-specific directories and set ownership as the simulator user
-RUN mkdir -p ${POLICY_HOME}/dmaap-sim \
-    && mkdir -p ${POLICY_HOME}/dmaap-sim/bin \
-    && mkdir -p ${POLICY_LOGS} \
-    && chown -R policy:policy ${POLICY_LOGS} \
-    && mkdir /packages
-
-# Unpack the tarball
-COPY policy-models-sim-dmaap-tarball.tar.gz /packages
-RUN tar xvfz /packages/policy-models-sim-dmaap-tarball.tar.gz --directory ${POLICY_HOME}/dmaap-sim \
-    && rm /packages/policy-models-sim-dmaap-tarball.tar.gz
-
-# Ensure everything has the correct permissions
-# Copy examples to DMaaP simulator user area
-COPY dmaap-sim.sh ${POLICY_HOME}/dmaap-sim/bin
-RUN find /opt/app -type d -perm 755 \
-    && find /opt/app -type f -perm 644 \
-    && chmod 755 ${POLICY_HOME}/dmaap-sim/bin/*
-
-USER policy
-ENV PATH ${POLICY_HOME}/dmaap-sim/bin:$PATH
-ENTRYPOINT [ "bash", "dmaap-sim.sh" ]
diff --git a/models-sim/models-sim-dmaap/src/main/package/docker/dmaap-sim.sh b/models-sim/models-sim-dmaap/src/main/package/docker/dmaap-sim.sh
deleted file mode 100644
index deb168f5d..000000000
--- a/models-sim/models-sim-dmaap/src/main/package/docker/dmaap-sim.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/bash
-#
-# ============LICENSE_START=======================================================
-#  Copyright (C) 2019 Nordix Foundation.
-#  Modifications copyright (C) 2020 Bell Canada. All rights reserved.
-# ================================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-# ============LICENSE_END=========================================================
-#
-
-if [ -z "$DMAAP_SIM_HOME" ]
-then
-	DMAAP_SIM_HOME=/opt/app/policy/dmaap-sim
-fi
-
-JAVA_HOME=/usr/lib/jvm/java-11-openjdk
-KEYSTORE="${DMAAP_SIM_HOME}/etc/ssl/policy-keystore"
-KEYSTORE_PASSWD="Pol1cy_0nap"
-TRUSTSTORE="${DMAAP_SIM_HOME}/etc/ssl/policy-truststore"
-TRUSTSTORE_PASSWD="Pol1cy_0nap"
-
-if [ "$#" -eq 1 ]
-then
-    CONFIG_FILE=$1
-else
-    CONFIG_FILE=${CONFIG_FILE}
-fi
-
-if [ -z "$CONFIG_FILE" ]
-then
-    CONFIG_FILE="$DMAAP_SIM_HOME/etc/DefaultConfig.json"
-fi
-
-echo "DMaaP simulation configuration file: $CONFIG_FILE"
-
-$JAVA_HOME/bin/java \
-    -cp "$DMAAP_SIM_HOME/etc:$DMAAP_SIM_HOME/lib/*" \
-    -Djavax.net.ssl.keyStore="$KEYSTORE" \
-    -Djavax.net.ssl.keyStorePassword="$KEYSTORE_PASSWD" \
-    -Djavax.net.ssl.trustStore="$TRUSTSTORE" \
-    -Djavax.net.ssl.trustStorePassword="$TRUSTSTORE_PASSWD" \
-    org.onap.policy.models.sim.dmaap.startstop.Main \
-    -c $CONFIG_FILE
diff --git a/models-sim/models-sim-dmaap/src/main/package/docker/docker_build.sh b/models-sim/models-sim-dmaap/src/main/package/docker/docker_build.sh
deleted file mode 100755
index 3ec907b8e..000000000
--- a/models-sim/models-sim-dmaap/src/main/package/docker/docker_build.sh
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/bash
-#
-# ============LICENSE_START=======================================================
-#  Copyright (C) 2019 Nordix Foundation.
-# ================================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-# ============LICENSE_END=========================================================
-#
-
-#
-# Script to build a Docker file for the DMaaP simulator. The docker image
-# generated by this script should NOT be placed in the ONAP nexus, it is
-# only for testing purposes.
-#
-
-if [ -z "$DMAAP_SIM_HOME" ]
-then
-	DMAAP_SIM_HOME=`pwd`
-fi
-
-# Check for the dockerfile
-if [ ! -f "$DMAAP_SIM_HOME/src/main/package/docker/Dockerfile" ]
-then
-	echo docker file "$DMAAP_SIM_HOME/src/main/package/docker/Dockerfile" not found
-	exit 1
-fi
-
-# Check for the start script
-if [ ! -f "$DMAAP_SIM_HOME/src/main/package/docker/dmaap-sim.sh" ]
-then
-	echo start script "$DMAAP_SIM_HOME/src/main/package/docker/dmaap-sim.sh" not found
-	exit 1
-fi
-
-# Check for the tarball
-tarball_count=`ls $DMAAP_SIM_HOME/target/policy-models-sim-dmaap-*tarball.tar.gz 2> /dev/null | wc | awk '{print $1}'`
-if [ "$tarball_count" -ne "1" ]
-then
-	echo one and only one tarball should exist in the target directory
-	exit 2
-fi
-
-# Set up the docker build
-rm -fr $DMAAP_SIM_HOME/target/docker
-mkdir $DMAAP_SIM_HOME/target/docker
-cp $DMAAP_SIM_HOME/src/main/package/docker/Dockerfile $DMAAP_SIM_HOME/target/docker
-cp $DMAAP_SIM_HOME/src/main/package/docker/dmaap-sim.sh $DMAAP_SIM_HOME/target/docker
-cp $DMAAP_SIM_HOME/target/policy-models-sim-dmaap-*tarball.tar.gz $DMAAP_SIM_HOME/target/docker/policy-models-sim-dmaap-tarball.tar.gz
-
-# Run the docker build
-cd $DMAAP_SIM_HOME/target
-docker build -t dmaap/simulator docker
-
-