From 0fe2333d835dfd768f62fc08923e23410c786a65 Mon Sep 17 00:00:00 2001 From: Jim Hahn 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 Change-Id: I43fd6a5c5ff9c4a0b537d3f297fdf2ad8248ba75 --- policy-jdk/alpine/README.md | 3 + policy-jdk/alpine/pom.xml | 154 +++++++++++++++++++++++++++ policy-jdk/alpine/src/main/docker/Dockerfile | 54 ++++++++++ 3 files changed, 211 insertions(+) create mode 100644 policy-jdk/alpine/README.md create mode 100644 policy-jdk/alpine/pom.xml create mode 100644 policy-jdk/alpine/src/main/docker/Dockerfile (limited to 'policy-jdk/alpine') diff --git a/policy-jdk/alpine/README.md b/policy-jdk/alpine/README.md new file mode 100644 index 00000000..0798eab7 --- /dev/null +++ b/policy-jdk/alpine/README.md @@ -0,0 +1,3 @@ +The common image for Policy project images. +Contains common set of packages used in most Policy apps containers +needing maven and a full JDK. diff --git a/policy-jdk/alpine/pom.xml b/policy-jdk/alpine/pom.xml new file mode 100644 index 00000000..b5df9e81 --- /dev/null +++ b/policy-jdk/alpine/pom.xml @@ -0,0 +1,154 @@ + + + + + 4.0.0 + + + org.onap.policy.docker + policy-jdk + 2.0.0-SNAPSHOT + + + pom + policy-jdk-alpine + Policy alpine jdk docker image + Policy alpine jdk docker image + + + ${project.artifactId}-${project.version} + + + org.codehaus.groovy.maven + gmaven-plugin + 1.0 + + + pre-clean + + execute + + + + 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']; + + + + + + + io.fabric8 + docker-maven-plugin + + + true + 1.23 + ${docker.pull.registry} + ${docker.push.registry} + + + onap/policy-jdk-alpine:latest-${project.docker.arch} + + try + Dockerfile + + ${project.version}-${project.docker.arch} + ${project.docker.latesttag.version}-${project.docker.arch} + + + ${docker.build.version} + + + + + + + + + clean-images + pre-clean + + remove + + + true + + + + + generate-images + generate-sources + + build + + + + + push-images + deploy + + build + push + + + onap/policy-jdk-alpine + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + org.apache.maven.plugins + maven-install-plugin + + true + + + + + + diff --git a/policy-jdk/alpine/src/main/docker/Dockerfile b/policy-jdk/alpine/src/main/docker/Dockerfile new file mode 100644 index 00000000..a258a314 --- /dev/null +++ b/policy-jdk/alpine/src/main/docker/Dockerfile @@ -0,0 +1,54 @@ +# ============LICENSE_START======================================================= +# Copyright (C) 2019 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========================================================= + +# Docker file to build a base image for all policy components images +# +# $JAVA_HOME is set to /usr/lib/jvm/java-11-openjdk +# more details at https://hub.docker.com/_/openjdk + +FROM alpine:latest + +LABEL maintainer="Policy Team" + +ENV POLICY_HOME=/opt/app/policy + +RUN apk update \ + && apk add --no-cache \ + bash \ + busybox-extras \ + coreutils \ + curl \ + findutils \ + grep \ + httpie \ + jq \ + maven \ + nss \ + openjdk11 \ + openssh \ + procps \ + py-pip \ + python \ + unzip \ + wget \ + zip \ + && addgroup -S policy \ + && adduser -S --shell /bin/bash -G policy policy \ + && mkdir -p ${POLICY_HOME}/etc/ssl \ + && chown -R policy:policy ${POLICY_HOME} -- cgit 1.2.3-korg