diff options
| author |   Pamela Dragosh <pdragosh@research.att.com> | 2020-01-13 13:32:53 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-01-13 13:32:53 +0000 |
| commit | 3a992ae9cbff19d8e8838390d95ab33615560636 (patch) | |
| tree | c872fbe38c1896866d00a60a3af5f7792e4c49a1 /controlloop/packages/docker-controlloop | |
| parent | 152933f5f5580531ec2f03af6b772a99a8517599 (diff) | |
| parent | 0945c4f6fad83f1dfe59914a5cb4717d41211b23 (diff) | |
Merge "Parameterize base-image version for drools-apps"
Diffstat (limited to 'controlloop/packages/docker-controlloop')
| -rw-r--r-- | controlloop/packages/docker-controlloop/pom.xml | 29 | ||||
| -rw-r--r-- | controlloop/packages/docker-controlloop/src/main/docker/Dockerfile | 2 |
2 files changed, 29 insertions, 2 deletions
diff --git a/controlloop/packages/docker-controlloop/pom.xml b/controlloop/packages/docker-controlloop/pom.xml index f709585ee..a4c893a19 100644 --- a/controlloop/packages/docker-controlloop/pom.xml +++ b/controlloop/packages/docker-controlloop/pom.xml @@ -3,7 +3,7 @@ ONAP ================================================================================ Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. - Modifications Copyright (C) 2019 Bell Canada. + Modifications Copyright (C) 2019-2020 Bell Canada. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -80,6 +80,32 @@ </execution> </executions> </plugin> + <!--fabric8.io docker-maven-plugin does not support ARG usage in the FROM statement of Dockerfile + even though docker supports it: https://github.com/fabric8io/docker-maven-plugin/issues/859. + As a workaround we shall use maven-antrun-plugin to copy the Dockerfile and apply filters to + replace the parameterized base-image version. The fabric8.io docker-maven-plugin shall use this filtered file + to build the image. After the image is built we perform a cleanup to remove the filtered file.--> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>update-parameterized-dockerfile</id> + <phase>initialize</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <copy file="src/main/docker/Dockerfile" toFile="${project.build.directory}/docker-tmp/Dockerfile"> + <filterset> + <filter token="version.policy.drools-pdp" value="${version.policy.drools-pdp}"/> + </filterset> + </copy> + </tasks> + </configuration> + </execution> + </executions> + </plugin> <plugin> <groupId>io.fabric8</groupId> <artifactId>docker-maven-plugin</artifactId> @@ -93,6 +119,7 @@ <name>onap/policy-pdpd-cl</name> <build> <cleanup>try</cleanup> + <contextDir>${project.build.directory}/docker-tmp</contextDir> <dockerFile>Dockerfile</dockerFile> <tags> <tag>${project.version}</tag> diff --git a/controlloop/packages/docker-controlloop/src/main/docker/Dockerfile b/controlloop/packages/docker-controlloop/src/main/docker/Dockerfile index 14e8c7400..98bf35a8e 100644 --- a/controlloop/packages/docker-controlloop/src/main/docker/Dockerfile +++ b/controlloop/packages/docker-controlloop/src/main/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM onap/policy-drools:1.6-SNAPSHOT-latest +FROM onap/policy-drools:@version.policy.drools-pdp@ ARG BUILD_VERSION_APP_CL=${BUILD_VERSION_APP_CL} ENV BUILD_VERSION_APP_CL=${BUILD_VERSION_APP_CL} |