From 0fe2333d835dfd768f62fc08923e23410c786a65 Mon Sep 17 00:00:00 2001
From: Jim Hahn <jrh3@att.com>
Date: Mon, 13 Jan 2020 16:36:38 -0500
Subject: Update docker images for java 11

Added debian-slim images based off of jre-slim.
Removed alpine images from the build.

If it's determined that we need a jdk instead of a jre, then
"jre" can be changed to "jdk" in the policy-base Dockerfile.
As an alternative, a new policy-docker-jdk image could be created,
based off of "jdk" and all of the apt packages added to it.  In that
case, it would probably be appropriate to removed maven from the
packages that are loaded into the policy-common image.
Addressed first round of review comments:
- use specific version of java 11
- removed docker-maven-plugin version
- replaced the images with policy-jre-debian and policy-jdk-debian
- added a policy-jdk-alpine image, which includes the jdk & maven, but
  is significantly smaller than the debian-slim version
- added a policy-jre-alpine image
Addressed additional review comments:
- removed BUILD_VERSION
- installed maven packages instead of downloading via curl
- added link to /usr/lib/jvm

Issue-ID: POLICY-1586
Signed-off-by: Jim Hahn <jrh3@att.com>
Change-Id: I43fd6a5c5ff9c4a0b537d3f297fdf2ad8248ba75
---
 policy-jre/debian-slim/README.md                  |   4 +
 policy-jre/debian-slim/pom.xml                    | 150 ++++++++++++++++++++++
 policy-jre/debian-slim/src/main/docker/Dockerfile |  44 +++++++
 3 files changed, 198 insertions(+)
 create mode 100644 policy-jre/debian-slim/README.md
 create mode 100644 policy-jre/debian-slim/pom.xml
 create mode 100644 policy-jre/debian-slim/src/main/docker/Dockerfile

(limited to 'policy-jre/debian-slim')

diff --git a/policy-jre/debian-slim/README.md b/policy-jre/debian-slim/README.md
new file mode 100644
index 00000000..40c870eb
--- /dev/null
+++ b/policy-jre/debian-slim/README.md
@@ -0,0 +1,4 @@
+The common image for Policy project images.
+Contains basic set of packages used in every Policy app container
+needing a JRE, but not a full JDK.
+
diff --git a/policy-jre/debian-slim/pom.xml b/policy-jre/debian-slim/pom.xml
new file mode 100644
index 00000000..b49710c0
--- /dev/null
+++ b/policy-jre/debian-slim/pom.xml
@@ -0,0 +1,150 @@
+<!--
+  ============LICENSE_START=======================================================
+   Copyright (C) 2019 Ericsson, Tieto. All rights reserved.
+   Modifications 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=========================================================
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.policy.docker</groupId>
+        <artifactId>policy-jre</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+    </parent>
+
+    <packaging>pom</packaging>
+    <artifactId>policy-jre-debian</artifactId>
+    <name>Policy debian-slim jre docker image</name>
+    <description>Policy debian-slim jre docker image</description>
+
+    <build>
+        <finalName>${project.artifactId}-${project.version}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.groovy.maven</groupId>
+                <artifactId>gmaven-plugin</artifactId>
+                <version>1.0</version>
+                <executions>
+                    <execution>
+                        <phase>pre-clean</phase>
+                        <goals>
+                            <goal>execute</goal>
+                        </goals>
+                        <configuration>
+                            <source>
+                                println 'Project version: ' + project.properties['dist.project.version'];
+                                def versionArray;
+                                if ( project.properties['dist.project.version'] != null ) {
+                                    versionArray = project.properties['dist.project.version'].split('-');
+                                }
+
+                                if ( project.properties['dist.project.version'].endsWith("-SNAPSHOT") ) {
+                                    project.properties['project.docker.latesttag.version']=versionArray[0] + "-SNAPSHOT-latest";
+                                } else {
+                                    project.properties['project.docker.latesttag.version']=versionArray[0] + "-STAGING-latest";
+                                }
+
+                                println 'New tag for docker: ' + project.properties['project.docker.latesttag.version'];
+                                if ( "aarch64".equals(System.properties['os.arch']) ) {
+                                    project.properties['project.docker.arch'] = "arm64";
+                                } else {
+                                    project.properties['project.docker.arch'] = System.properties['os.arch'];
+                                }
+                                println 'Using arch for docker: ' + project.properties['project.docker.arch'];
+                            </source>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>io.fabric8</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
+                <configuration>
+                    <verbose>true</verbose>
+                    <apiVersion>1.23</apiVersion>
+                    <pullRegistry>${docker.pull.registry}</pullRegistry>
+                    <pushRegistry>${docker.push.registry}</pushRegistry>
+
+                    <images>
+                        <image>
+                            <name>onap/policy-jre-debian:latest-${project.docker.arch}</name>
+                            <build>
+                                <cleanup>try</cleanup>
+                                <dockerFile>Dockerfile</dockerFile>
+                                <tags>
+                                    <tag>${project.version}-${project.docker.arch}</tag>
+                                    <tag>${project.docker.latesttag.version}-${project.docker.arch}</tag>
+                                </tags>
+                            </build>
+                        </image>
+                    </images>
+                </configuration>
+
+                <executions>
+                    <execution>
+                        <id>clean-images</id>
+                        <phase>pre-clean</phase>
+                        <goals>
+                            <goal>remove</goal>
+                        </goals>
+                        <configuration>
+                            <removeAll>true</removeAll>
+                        </configuration>
+                    </execution>
+
+                    <execution>
+                        <id>generate-images</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                    </execution>
+
+                    <execution>
+                        <id>push-images</id>
+                        <phase>deploy</phase>
+                        <goals>
+                            <goal>build</goal>
+                            <goal>push</goal>
+                        </goals>
+                        <configuration>
+                            <image>onap/policy-jre-debian</image>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-install-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/policy-jre/debian-slim/src/main/docker/Dockerfile b/policy-jre/debian-slim/src/main/docker/Dockerfile
new file mode 100644
index 00000000..0d2a6d91
--- /dev/null
+++ b/policy-jre/debian-slim/src/main/docker/Dockerfile
@@ -0,0 +1,44 @@
+#   ============LICENSE_START=======================================================
+#    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 a base image for all policy components images
+#
+
+FROM openjdk:11.0.5-jre-slim
+
+LABEL maintainer="Policy Team"
+
+ENV POLICY_HOME=/opt/app/policy
+
+RUN apt-get -y update \
+    && apt-get -y install \
+        curl \
+        httpie \
+        jq \
+        less \
+        python \
+        python-pip \
+        ssh \
+        unzip \
+        wget \
+        zip \
+    && mkdir /usr/lib/jvm \
+    && ln -s /usr/local/openjdk-11 /usr/lib/jvm/java-11-openjdk \
+    && adduser --shell /bin/bash --disabled-password policy \
+    && mkdir -p ${POLICY_HOME}/etc/ssl \
+    && chown -R policy:policy ${POLICY_HOME}
-- 
cgit 1.2.3-korg