aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--policy-base/alpine/pom.xml2
-rw-r--r--policy-base/alpine/src/main/docker/Dockerfile23
-rw-r--r--policy-base/pom.xml2
-rw-r--r--policy-common/alpine/pom.xml6
-rw-r--r--policy-common/alpine/src/main/docker/Dockerfile24
-rw-r--r--policy-common/pom.xml3
6 files changed, 47 insertions, 13 deletions
diff --git a/policy-base/alpine/pom.xml b/policy-base/alpine/pom.xml
index cc811af8..3027fb29 100644
--- a/policy-base/alpine/pom.xml
+++ b/policy-base/alpine/pom.xml
@@ -1,6 +1,6 @@
<!--
============LICENSE_START=======================================================
- Copyright (C) 2018 Ericsson, Tieto. All rights reserved.
+ Copyright (C) 2019 Ericsson, Tieto. 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.
diff --git a/policy-base/alpine/src/main/docker/Dockerfile b/policy-base/alpine/src/main/docker/Dockerfile
index 26f20f52..e131ae67 100644
--- a/policy-base/alpine/src/main/docker/Dockerfile
+++ b/policy-base/alpine/src/main/docker/Dockerfile
@@ -1,9 +1,26 @@
+# ============LICENSE_START=======================================================
+# Copyright (C) 2019 Tieto. 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 a base image for all policy components images
#
-# Docker file to build a base image for all policy apps images
-#
# $JAVA_HOME is set to /usr/lib/jvm/java-1.8-openjdk
# more details at https://hub.docker.com/_/openjdk
-#
+
FROM openjdk:8-alpine
LABEL maintainer="Policy Team"
diff --git a/policy-base/pom.xml b/policy-base/pom.xml
index 4ec12073..dd046613 100644
--- a/policy-base/pom.xml
+++ b/policy-base/pom.xml
@@ -1,6 +1,6 @@
<!--
============LICENSE_START=======================================================
- Copyright (C) 2018 Ericsson, Tieto. All rights reserved.
+ Copyright (C) 2019 Ericsson, Tieto. 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.
diff --git a/policy-common/alpine/pom.xml b/policy-common/alpine/pom.xml
index 3668d893..cd6ce9de 100644
--- a/policy-common/alpine/pom.xml
+++ b/policy-common/alpine/pom.xml
@@ -1,6 +1,6 @@
<!--
============LICENSE_START=======================================================
- Copyright (C) 2018 Ericsson, Tieto. All rights reserved.
+ Copyright (C) 2019 Ericsson, Tieto. 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.
@@ -77,7 +77,6 @@
<apiVersion>1.23</apiVersion>
<pullRegistry>${docker.pull.registry}</pullRegistry>
<pushRegistry>${docker.push.registry}</pushRegistry>
-
<images>
<image>
<name>onap/policy-common-alpine</name>
@@ -89,6 +88,9 @@
<tag>${project.version}-${maven.build.timestamp}</tag>
<tag>${project.docker.latesttag.version}</tag>
</tags>
+ <args>
+ <BUILD_VERSION>${docker.build.version}</BUILD_VERSION>
+ </args>
</build>
</image>
</images>
diff --git a/policy-common/alpine/src/main/docker/Dockerfile b/policy-common/alpine/src/main/docker/Dockerfile
index 19ea230c..96f4df53 100644
--- a/policy-common/alpine/src/main/docker/Dockerfile
+++ b/policy-common/alpine/src/main/docker/Dockerfile
@@ -1,16 +1,30 @@
+# ============LICENSE_START=======================================================
+# Copyright (C) 2019 Tieto. 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
#
-# Docker file to build an image that contains commom packages for Policy apps
+# 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 contains commom packages for Policy components
#
FROM onap/policy-base-alpine
LABEL maintainer="Policy Team"
-ARG HTTP_PROXY=${HTTP_PROXY}
-ARG HTTPS_PROXY=${HTTPS_PROXY}
ARG BUILD_VERSION=${BUILD_VERSION}
-ENV http_proxy $HTTP_PROXY
-ENV https_proxy $HTTPS_PROXY
ENV BUILD_VERSION ${BUILD_VERSION}
ENV POLICY_HOME=/opt/app/policy
diff --git a/policy-common/pom.xml b/policy-common/pom.xml
index 5e2ac5ba..a17a1bb5 100644
--- a/policy-common/pom.xml
+++ b/policy-common/pom.xml
@@ -1,6 +1,6 @@
<!--
============LICENSE_START=======================================================
- Copyright (C) 2018 Ericsson, Tieto. All rights reserved.
+ Copyright (C) 2019 Ericsson, Tieto. 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.
@@ -40,6 +40,7 @@
<docker.pull.registry>nexus3.onap.org:10001</docker.pull.registry>
<docker.push.registry>nexus3.onap.org:10003</docker.push.registry>
<maven.build.timestamp.format>yyyyMMdd'T'HHmm</maven.build.timestamp.format>
+ <docker.build.version>${project.version}</docker.build.version>
</properties>
<profiles>