diff options
author | Jim Hahn <jrh3@att.com> | 2021-07-12 15:25:53 -0400 |
---|---|---|
committer | Jim Hahn <jrh3@att.com> | 2021-07-12 17:04:14 -0400 |
commit | 6be3c1abaf5c3eea0b353675835b6d2ce4584fe7 (patch) | |
tree | ad5376e94d48eb518670939823702d18c49b3f11 /models-sim/policy-models-simulators/src | |
parent | 886406e003934b83da7a2b538a0574a76fd5dd4d (diff) |
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>
Diffstat (limited to 'models-sim/policy-models-simulators/src')
4 files changed, 0 insertions, 219 deletions
diff --git a/models-sim/policy-models-simulators/src/main/package/docker/Dockerfile b/models-sim/policy-models-simulators/src/main/package/docker/Dockerfile deleted file mode 100644 index e9ed6db27..000000000 --- a/models-sim/policy-models-simulators/src/main/package/docker/Dockerfile +++ /dev/null @@ -1,59 +0,0 @@ -# -# ============LICENSE_START======================================================= -# ONAP -# ================================================================================ -# Copyright (C) 2020 AT&T Intellectual Property. 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========================================================= -# - -# -# Docker file to build an image that runs the simulators -# - -FROM onap/policy-jre-alpine - -LABEL maintainer="Policy Team" - -ARG POLICY_LOGS=/var/log/onap/policy/simulators - -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}/simulators \ - && mkdir -p ${POLICY_HOME}/simulators/bin \ - && mkdir -p ${POLICY_LOGS} \ - && mkdir /packages - -# Unpack the tarball -COPY policy-models-simulators-tarball.tar.gz /packages -RUN tar xvfz /packages/policy-models-simulators-tarball.tar.gz --directory ${POLICY_HOME}/simulators \ - && rm /packages/policy-models-simulators-tarball.tar.gz - -# Ensure everything has the correct permissions -# Copy scripts simulator user area -COPY simulators.sh ${POLICY_HOME}/simulators/bin -RUN find /opt/app -type d -perm 755 \ - && find /opt/app -type f -perm 644 \ - && chmod 755 ${POLICY_HOME}/simulators/bin/* \ - && chown -R policy:policy $POLICY_HOME $POLICY_LOGS - -USER policy:policy - -ENV PATH ${POLICY_HOME}/simulators/bin:$PATH -ENTRYPOINT [ "bash", "simulators.sh" ] diff --git a/models-sim/policy-models-simulators/src/main/package/docker/docker_build.sh b/models-sim/policy-models-simulators/src/main/package/docker/docker_build.sh deleted file mode 100644 index efbb1dc0f..000000000 --- a/models-sim/policy-models-simulators/src/main/package/docker/docker_build.sh +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/bash -# -# ============LICENSE_START======================================================= -# ONAP -# ================================================================================ -# Copyright (C) 2020 AT&T Intellectual Property. 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========================================================= -# - -# -# Script to build a Docker file for the simulators. The docker image -# generated by this script should NOT be placed in the ONAP nexus, it is -# only for testing purposes. -# - -if [ -z "$SIMULATOR_HOME" ] -then - SIMULATOR_HOME=$PWD -fi - -# Check for the dockerfile -if [ ! -f "$SIMULATOR_HOME/src/main/package/docker/Dockerfile" ] -then - echo docker file "$SIMULATOR_HOME/src/main/package/docker/Dockerfile" not found - exit 1 -fi - -# Check for the start script -if [ ! -f "$SIMULATOR_HOME/src/main/package/docker/simulators.sh" ] -then - echo start script "$SIMULATOR_HOME/src/main/package/docker/simulators.sh" not found - exit 1 -fi - -# Check for the tarball -tarball_count=`ls $SIMULATOR_HOME/target/policy-models-simulators-*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 $SIMULATOR_HOME/target/docker -mkdir $SIMULATOR_HOME/target/docker -cp $SIMULATOR_HOME/src/main/package/docker/Dockerfile $SIMULATOR_HOME/target/docker -cp $SIMULATOR_HOME/src/main/package/docker/simulators.sh $SIMULATOR_HOME/target/docker -cp $SIMULATOR_HOME/target/policy-models-simulators-*tarball.tar.gz \ - $SIMULATOR_HOME/target/docker/policy-models-simulators-tarball.tar.gz - -# Run the docker build -cd $SIMULATOR_HOME/target -docker build -t policy/simulators docker 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 deleted file mode 100644 index 7e38f374c..000000000 --- a/models-sim/policy-models-simulators/src/main/package/docker/simulators.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/bash -# -# ============LICENSE_START======================================================= -# ONAP -# ================================================================================ -# Copyright (C) 2020 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"); -# 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 "$SIMULATOR_HOME" ] -then - SIMULATOR_HOME=${POLICY_HOME}/simulators -fi - -JAVA_HOME=/usr/lib/jvm/java-11-openjdk -KEYSTORE="${SIMULATOR_HOME}/etc/ssl/policy-keystore" -KEYSTORE_PASSWD="Pol1cy_0nap" -TRUSTSTORE="${SIMULATOR_HOME}/etc/ssl/policy-truststore" -TRUSTSTORE_PASSWD="Pol1cy_0nap" - -${JAVA_HOME}/bin/java \ - -cp "${SIMULATOR_HOME}/etc:${SIMULATOR_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.simulators.Main \ - ${SIMULATOR_HOME}/etc/parameters/simParameters.json diff --git a/models-sim/policy-models-simulators/src/main/package/tarball/assembly.xml b/models-sim/policy-models-simulators/src/main/package/tarball/assembly.xml deleted file mode 100644 index 9a2fd65df..000000000 --- a/models-sim/policy-models-simulators/src/main/package/tarball/assembly.xml +++ /dev/null @@ -1,50 +0,0 @@ -<!-- - ============LICENSE_START======================================================= - Copyright (C) 2020 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"); - 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========================================================= ---> - -<assembly> - <id>tarball</id> - <formats> - <format>tar.gz</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> - <dependencySets> - <dependencySet> - <useProjectArtifact>true</useProjectArtifact> - <outputDirectory>/lib</outputDirectory> - <unpack>false</unpack> - <scope>runtime</scope> - <includes> - <include>*:jar</include> - </includes> - </dependencySet> - </dependencySets> - <fileSets> - <fileSet> - <directory>${project.basedir}/src/main/resources/ssl - </directory> - <includes> - <include>policy*</include> - </includes> - <outputDirectory>etc${file.separator}ssl</outputDirectory> - <lineEnding>keep</lineEnding> - </fileSet> - </fileSets> -</assembly> |