diff options
author | Jorge Hernandez <jorge.hernandez-herrero@att.com> | 2019-02-07 15:58:58 -0600 |
---|---|---|
committer | Jorge Hernandez <jorge.hernandez-herrero@att.com> | 2019-02-08 11:58:59 -0600 |
commit | 638480e04fc6eadeebdcb018573a463a1c61cdaa (patch) | |
tree | b62fb74d3a89e6733691377564f0d079efc06b58 /controlloop/packages | |
parent | 0c1084282ae62cbe9d5b054057aed1b759dc82cd (diff) |
basic image with CL app preloaded
The image can replace the drools-pdp and only
overrides what is necessary to make sure the CL
application is in the image. There should be
no functional difference.
Tooling to operate with docker images is provided
as well, for example:
controlloop/tools/docker-cl --help
BUILD INFO:
image: policy-pdpd-cl
image-path: controlloop/packages/docker-controlloop/target/policy-pdpd-cl
image: policy-pdpd-cl
registry: nexus3.onap.org:10003
patch: 1.4.0-SNAPSHOT
version: 1.4-SNAPSHOT
timestamp: 20190207T220835
TAGS:
BUILD:
verify:
onap/policy-pdpd-cl:latest
nexus3.onap.org:10003/onap/policy-pdpd-cl:1.4-SNAPSHOT-latest
nexus3.onap.org:10003/onap/policy-pdpd-cl:1.4.0-SNAPSHOT-20190207T220835Z
merge:
onap/policy-pdpd-cl:latest
nexus3.onap.org:10003/onap/policy-pdpd-cl:1.4-SNAPSHOT-latest
nexus3.onap.org:10003/onap/policy-pdpd-cl:1.4.0-SNAPSHOT-20190207T220835Z
release:
onap/policy-pdpd-cl:latest
nexus3.onap.org:10003/onap/policy-pdpd-cl:latest
nexus3.onap.org:10003/onap/policy-pdpd-cl:1.4-SNAPSHOT-latest
nexus3.onap.org:10003/onap/policy-pdpd-cl:1.4.0-SNAPSHOT-STAGING-20190207T220835Z
PUSH:
verify:
merge:
nexus3.onap.org:10003/onap/policy-pdpd-cl:1.4-SNAPSHOT-latest
nexus3.onap.org:10003/onap/policy-pdpd-cl:1.4.0-SNAPSHOT-20190207T220835Z
release:
nexus3.onap.org:10003/onap/policy-pdpd-cl:1.4-SNAPSHOT-latest
nexus3.onap.org:10003/onap/policy-pdpd-cl:1.4.0-SNAPSHOT-STAGING-20190207T220835Z
SYNTAX:
docker-cl
[--help|-h] [--build|-b <repo:tag>] [--push|-p <repo:tag>]
[--verify|-v] [--merge|-m] [--release|-r]
[--run <volume-full-path>] [--cmd <volume-full-path> <cmd>]
Change-Id: I0917c0bca212fc0b543e52ae1615c513d43f7d93
Issue-ID: POLICY-1505
Signed-off-by: Jorge Hernandez <jorge.hernandez-herrero@att.com>
Diffstat (limited to 'controlloop/packages')
-rw-r--r-- | controlloop/packages/basex-controlloop/pom.xml | 2 | ||||
-rw-r--r-- | controlloop/packages/basex-controlloop/src/assembly/zip.xml | 2 | ||||
-rw-r--r-- | controlloop/packages/basex-controlloop/src/main/resources/controlloop.version (renamed from controlloop/packages/basex-controlloop/src/main/resources/apps-controlloop-version) | 0 | ||||
-rw-r--r-- | controlloop/packages/docker-controlloop/pom.xml | 113 | ||||
-rw-r--r-- | controlloop/packages/docker-controlloop/src/main/docker/Dockerfile | 7 | ||||
-rw-r--r-- | controlloop/packages/pom.xml | 3 |
6 files changed, 124 insertions, 3 deletions
diff --git a/controlloop/packages/basex-controlloop/pom.xml b/controlloop/packages/basex-controlloop/pom.xml index 593016816..1d3fe3d3d 100644 --- a/controlloop/packages/basex-controlloop/pom.xml +++ b/controlloop/packages/basex-controlloop/pom.xml @@ -54,7 +54,7 @@ <resource> <directory>src/main/resources</directory> <includes> - <include>apps-controlloop-version</include> + <include>controlloop.version</include> </includes> <filtering>true</filtering> </resource> diff --git a/controlloop/packages/basex-controlloop/src/assembly/zip.xml b/controlloop/packages/basex-controlloop/src/assembly/zip.xml index caa943c21..ba1af668d 100644 --- a/controlloop/packages/basex-controlloop/src/assembly/zip.xml +++ b/controlloop/packages/basex-controlloop/src/assembly/zip.xml @@ -37,7 +37,7 @@ <fileMode>755</fileMode> <directoryMode>700</directoryMode> <includes> - <include>apps-controlloop-version</include> + <include>controlloop.version</include> </includes> </fileSet> </fileSets> diff --git a/controlloop/packages/basex-controlloop/src/main/resources/apps-controlloop-version b/controlloop/packages/basex-controlloop/src/main/resources/controlloop.version index 066e5712e..066e5712e 100644 --- a/controlloop/packages/basex-controlloop/src/main/resources/apps-controlloop-version +++ b/controlloop/packages/basex-controlloop/src/main/resources/controlloop.version diff --git a/controlloop/packages/docker-controlloop/pom.xml b/controlloop/packages/docker-controlloop/pom.xml new file mode 100644 index 000000000..d55f5eab1 --- /dev/null +++ b/controlloop/packages/docker-controlloop/pom.xml @@ -0,0 +1,113 @@ +<!-- + ============LICENSE_START======================================================= + ONAP + ================================================================================ + Copyright (C) 2019 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. + ============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.drools-applications.controlloop.packages</groupId> + <artifactId>packages</artifactId> + <version>1.4.0-SNAPSHOT</version> + </parent> + + <artifactId>docker-controlloop</artifactId> + <packaging>pom</packaging> + + <name>docker-controlloop</name> + <description>ONAP Policy Control Loop PDP-D Docker Build</description> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy-cl-apps-zip</id> + <phase>prepare-package</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <outputDirectory>${project.build.directory}/policy-pdpd-cl</outputDirectory> + <overWriteReleases>false</overWriteReleases> + <overWriteSnapshots>true</overWriteSnapshots> + <artifactItems> + <artifactItem> + <groupId>org.onap.policy.drools-applications.controlloop.packages</groupId> + <artifactId>apps-controlloop</artifactId> + <version>${project.version}</version> + <type>zip</type> + <destFileName>apps-controlloop.zip</destFileName> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <executions> + <execution> + <id>copy-resources</id> + <phase>prepare-package</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${project.build.directory}/policy-pdpd-cl</outputDirectory> + <resources> + <resource> + <directory>src/main/docker</directory> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <executions> + <execution> + <id>get-target-version</id> + <phase>prepare-package</phase> + <goals> + <goal>exec</goal> + </goals> + </execution> + </executions> + <configuration> + <executable>echo</executable> + <workingDirectory>${project.build.directory}</workingDirectory> + <arguments> + <argument>${project.version}</argument> + </arguments> + <outputFile>${project.build.directory}/version</outputFile> + </configuration> + </plugin> + + </plugins> + </build> + +</project> diff --git a/controlloop/packages/docker-controlloop/src/main/docker/Dockerfile b/controlloop/packages/docker-controlloop/src/main/docker/Dockerfile new file mode 100644 index 000000000..7bb2006cf --- /dev/null +++ b/controlloop/packages/docker-controlloop/src/main/docker/Dockerfile @@ -0,0 +1,7 @@ +FROM onap/policy-drools:1.4-SNAPSHOT-latest + +ARG BUILD_VERSION_APP_CL=${BUILD_VERSION_APP_CL} +ENV BUILD_VERSION_APP_CL=${BUILD_VERSION_APP_CL} + +ADD apps-controlloop.zip ./ +RUN unzip apps-controlloop.zip diff --git a/controlloop/packages/pom.xml b/controlloop/packages/pom.xml index 045c69101..3b192af89 100644 --- a/controlloop/packages/pom.xml +++ b/controlloop/packages/pom.xml @@ -2,7 +2,7 @@ ============LICENSE_START======================================================= Drools PDP Application Models ================================================================================ - Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + Copyright (C) 2017, 2019 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. @@ -38,5 +38,6 @@ <module>basex-controlloop</module> <module>artifacts-controlloop</module> <module>apps-controlloop</module> + <module>docker-controlloop</module> </modules> </project> |