diff options
author | liamfallon <liam.fallon@est.tech> | 2021-05-20 15:43:35 +0100 |
---|---|---|
committer | liamfallon <liam.fallon@est.tech> | 2021-05-20 16:40:13 +0100 |
commit | fa94a96fed5fd7af230a90373a04da47370e2eea (patch) | |
tree | 403698f7b95a884248c1414304e42d23e406d05e /src/main/docker/backend | |
parent | 65262f8dd9a6b9cbc284daa02ae332380e374483 (diff) |
Merge master into tosca-poc branch
This review was created with the commands:
git co master
git pull
git co tosca-poc
git pull
git merge -X theirs master
With this merge, the CLAMP master branch is merged into tosca-poc, and,
apart from the tosca-controlloop directory, they are identical
Issue-ID: POLICY-3215
Change-Id: Iaa1c4894b33508f8bb75b7d1c0dd414964497625
Signed-off-by: liamfallon <liam.fallon@est.tech>
Diffstat (limited to 'src/main/docker/backend')
-rw-r--r-- | src/main/docker/backend/Dockerfile | 47 | ||||
-rw-r--r-- | src/main/docker/backend/backend-files.xml | 43 |
2 files changed, 0 insertions, 90 deletions
diff --git a/src/main/docker/backend/Dockerfile b/src/main/docker/backend/Dockerfile deleted file mode 100644 index 63268d805..000000000 --- a/src/main/docker/backend/Dockerfile +++ /dev/null @@ -1,47 +0,0 @@ -###
-# ============LICENSE_START=======================================================
-# ONAP CLAMP
-# ================================================================================
-# Copyright (C) 2018 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.
-# ============LICENSE_END============================================
-# ===================================================================
-#
-###
-
-FROM onap/integration-java11:7.1.0
-
-MAINTAINER "The Onap Team"
-LABEL Description="This image contains alpine, openjdk 11 and policy clamp"
-
-ARG http_proxy
-ARG https_proxy
-ENV HTTP_PROXY=$http_proxy
-ENV HTTPS_PROXY=$https_proxy
-ENV http_proxy=$HTTP_PROXY
-ENV https_proxy=$HTTPS_PROXY
-
-USER root
-
-RUN mkdir -p /opt/policy/clamp && \
- chown -R onap:onap /opt/policy/clamp
-
-VOLUME /opt/policy/clamp/config
-
-COPY --chown=onap:onap onap-policy-clamp-backend/policy-clamp-backend.jar /opt/policy/clamp/policy-clamp-backend.jar
-
-USER onap
-WORKDIR /opt/policy/clamp/
-ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-XX:MinRAMPercentage=50.0", "-XX:MaxRAMPercentage=75.0","-jar" ,"./policy-clamp-backend.jar"]
\ No newline at end of file diff --git a/src/main/docker/backend/backend-files.xml b/src/main/docker/backend/backend-files.xml deleted file mode 100644 index c73c47f64..000000000 --- a/src/main/docker/backend/backend-files.xml +++ /dev/null @@ -1,43 +0,0 @@ -<!-- - ============LICENSE_START======================================================= - ECOMP CLAMP - ================================================================================ - Copyright (C) 2017 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. - ============LICENSE_END========================================================= - --> - -<assembly - xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1 http://maven.apache.org/xsd/assembly-1.1.1.xsd"> - <id>clamp-files</id> - - <formats> - <format>tar.gz</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> - - <fileSets> - <!-- include config files --> - <fileSet> - <includes> - <include>${project.build.finalName}.jar</include> - </includes> - <directory>${project.build.directory}</directory> - <outputDirectory></outputDirectory> - </fileSet> - </fileSets> - -</assembly> |