diff options
| -rw-r--r-- | policy-jdk/debian-slim/README.md | 3 | ||||
| -rw-r--r-- | policy-jdk/debian-slim/pom.xml | 145 | ||||
| -rw-r--r-- | policy-jdk/debian-slim/src/main/docker/Dockerfile | 46 | ||||
| -rw-r--r-- | policy-jdk/pom.xml | 1 | ||||
| -rw-r--r-- | policy-jre/debian-slim/README.md | 4 | ||||
| -rw-r--r-- | policy-jre/debian-slim/pom.xml | 145 | ||||
| -rw-r--r-- | policy-jre/debian-slim/src/main/docker/Dockerfile | 42 | ||||
| -rw-r--r-- | policy-jre/pom.xml | 1 |
8 files changed, 0 insertions, 387 deletions
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 @@ -<!-- - ============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-jdk</artifactId> - <version>2.1.0-SNAPSHOT</version> - </parent> - - <packaging>pom</packaging> - <artifactId>policy-jdk-debian</artifactId> - <name>Policy debian-slim jdk docker image</name> - <description>Policy debian-slim jdk 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>validate</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']; - </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-jdk-debian</name> - <build> - <cleanup>try</cleanup> - <dockerFile>Dockerfile</dockerFile> - <tags> - <tag>${project.version}</tag> - <tag>${project.version}-${maven.build.timestamp}</tag> - <tag>${project.docker.latesttag.version}</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-jdk-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-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 @@ <id>docker</id> <modules> <module>alpine</module> - <module>debian-slim</module> </modules> </profile> </profiles> 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 @@ -<!-- - ============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.1.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>validate</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']; - </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</name> - <build> - <cleanup>try</cleanup> - <dockerFile>Dockerfile</dockerFile> - <tags> - <tag>${project.version}</tag> - <tag>${project.version}-${maven.build.timestamp}</tag> - <tag>${project.docker.latesttag.version}</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 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 @@ <id>docker</id> <modules> <module>alpine</module> - <module>debian-slim</module> </modules> </profile> </profiles> |