From 8807bfea56bc923abd60ff407929780d02fd610e Mon Sep 17 00:00:00 2001 From: Taka Cho Date: Wed, 2 Sep 2020 12:55:44 -0400 Subject: remove debian docker image build In order to comply license violation, have to move to alpine docker image build. Hence removed all debian docker image build Issue-ID: POLICY-2793 Change-Id: Ifa225b37dd65d366e54aebef317853f43c79311e Signed-off-by: Taka Cho --- policy-jdk/debian-slim/README.md | 3 - policy-jdk/debian-slim/pom.xml | 145 ---------------------- policy-jdk/debian-slim/src/main/docker/Dockerfile | 46 ------- policy-jdk/pom.xml | 1 - policy-jre/debian-slim/README.md | 4 - policy-jre/debian-slim/pom.xml | 145 ---------------------- policy-jre/debian-slim/src/main/docker/Dockerfile | 42 ------- policy-jre/pom.xml | 1 - 8 files changed, 387 deletions(-) delete mode 100644 policy-jdk/debian-slim/README.md delete mode 100644 policy-jdk/debian-slim/pom.xml delete mode 100644 policy-jdk/debian-slim/src/main/docker/Dockerfile delete mode 100644 policy-jre/debian-slim/README.md delete mode 100644 policy-jre/debian-slim/pom.xml delete mode 100644 policy-jre/debian-slim/src/main/docker/Dockerfile diff --git a/policy-jdk/debian-slim/README.md b/policy-jdk/debian-slim/README.md deleted file mode 100644 index 0798eab7..00000000 --- a/policy-jdk/debian-slim/README.md +++ /dev/null @@ -1,3 +0,0 @@ -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/debian-slim/pom.xml b/policy-jdk/debian-slim/pom.xml deleted file mode 100644 index 2dd367dc..00000000 --- a/policy-jdk/debian-slim/pom.xml +++ /dev/null @@ -1,145 +0,0 @@ - - - - - 4.0.0 - - - org.onap.policy.docker - policy-jdk - 2.1.0-SNAPSHOT - - - pom - policy-jdk-debian - Policy debian-slim jdk docker image - Policy debian-slim jdk docker image - - - ${project.artifactId}-${project.version} - - - org.codehaus.groovy.maven - gmaven-plugin - 1.0 - - - validate - - 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']; - - - - - - - io.fabric8 - docker-maven-plugin - - - true - 1.23 - ${docker.pull.registry} - ${docker.push.registry} - - - onap/policy-jdk-debian - - try - Dockerfile - - ${project.version} - ${project.version}-${maven.build.timestamp} - ${project.docker.latesttag.version} - - - - - - - - - clean-images - pre-clean - - remove - - - true - - - - - generate-images - generate-sources - - build - - - - - push-images - deploy - - build - push - - - onap/policy-jdk-debian - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - org.apache.maven.plugins - maven-install-plugin - - true - - - - - diff --git a/policy-jdk/debian-slim/src/main/docker/Dockerfile b/policy-jdk/debian-slim/src/main/docker/Dockerfile deleted file mode 100644 index 55e38279..00000000 --- a/policy-jdk/debian-slim/src/main/docker/Dockerfile +++ /dev/null @@ -1,46 +0,0 @@ -# ============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 maven:3.6-jdk-11 - -LABEL maintainer="Policy Team" - -ARG MAVEN_VERSION=3.6.3 -ARG SHA=c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0 -ARG BASE_URL="https://www.apache.org/dyn/mirrors/mirrors.cgi?cca2=us&preferred=http://apache.claz.org/&action=download&filename=maven/maven-3/${MAVEN_VERSION}/binaries" - -ENV POLICY_HOME=/opt/app/policy - -RUN apt-get -y update \ - && apt-get -y install \ - curl \ - jq \ - less \ - ssh \ - unzip \ - vim \ - 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}/ \ - && chown policy:policy ${POLICY_HOME} diff --git a/policy-jdk/pom.xml b/policy-jdk/pom.xml index 088606ea..184ea67d 100644 --- a/policy-jdk/pom.xml +++ b/policy-jdk/pom.xml @@ -49,7 +49,6 @@ docker alpine - debian-slim diff --git a/policy-jre/debian-slim/README.md b/policy-jre/debian-slim/README.md deleted file mode 100644 index 40c870eb..00000000 --- a/policy-jre/debian-slim/README.md +++ /dev/null @@ -1,4 +0,0 @@ -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 deleted file mode 100644 index 91f34105..00000000 --- a/policy-jre/debian-slim/pom.xml +++ /dev/null @@ -1,145 +0,0 @@ - - - - - 4.0.0 - - - org.onap.policy.docker - policy-jre - 2.1.0-SNAPSHOT - - - pom - policy-jre-debian - Policy debian-slim jre docker image - Policy debian-slim jre docker image - - - ${project.artifactId}-${project.version} - - - org.codehaus.groovy.maven - gmaven-plugin - 1.0 - - - validate - - 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']; - - - - - - - io.fabric8 - docker-maven-plugin - - true - 1.23 - ${docker.pull.registry} - ${docker.push.registry} - - - - onap/policy-jre-debian - - try - Dockerfile - - ${project.version} - ${project.version}-${maven.build.timestamp} - ${project.docker.latesttag.version} - - - - - - - - - clean-images - pre-clean - - remove - - - true - - - - - generate-images - generate-sources - - build - - - - - push-images - deploy - - build - push - - - onap/policy-jre-debian - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - org.apache.maven.plugins - maven-install-plugin - - true - - - - - diff --git a/policy-jre/debian-slim/src/main/docker/Dockerfile b/policy-jre/debian-slim/src/main/docker/Dockerfile deleted file mode 100644 index 88161393..00000000 --- a/policy-jre/debian-slim/src/main/docker/Dockerfile +++ /dev/null @@ -1,42 +0,0 @@ -# ============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 \ - jq \ - less \ - ssh \ - unzip \ - vim \ - 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}/ \ - && chown policy:policy ${POLICY_HOME} diff --git a/policy-jre/pom.xml b/policy-jre/pom.xml index 95dd4eb8..9707d071 100644 --- a/policy-jre/pom.xml +++ b/policy-jre/pom.xml @@ -48,7 +48,6 @@ docker alpine - debian-slim -- cgit 1.2.3-korg