diff options
| author |   Pamela Dragosh <pdragosh@research.att.com> | 2020-01-03 13:09:14 +0000 |
|---|---|---|
| committer | Pamela Dragosh <pdragosh@research.att.com> | 2020-01-03 13:09:14 +0000 |
| commit | 33b0fb8aa6194a39fe9dbd7457d02a109d56a8a5 (patch) | |
| tree | f2a572d769bd7b1e795cdf59a21b8b65132c6f20 /controlloop/packages | |
| parent | a894ffb5f580dec7ab4e8ea367107fcee09fca1b (diff) | |
Revert "Parameterize base-image version for drools-apps"
This reverts commit a894ffb5f580dec7ab4e8ea367107fcee09fca1b.
Reason for revert: Merge failure
Issue-ID: POLICY-2318
Change-Id: I6ea6681677e0ee18f5bce0217f9216e590a53b77
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
Diffstat (limited to 'controlloop/packages')
| -rw-r--r-- | controlloop/packages/docker-controlloop/pom.xml | 39 | ||||
| -rw-r--r-- | controlloop/packages/docker-controlloop/src/main/docker/Dockerfile | 2 |
2 files changed, 1 insertions, 40 deletions
diff --git a/controlloop/packages/docker-controlloop/pom.xml b/controlloop/packages/docker-controlloop/pom.xml index 653fe251e..f709585ee 100644 --- a/controlloop/packages/docker-controlloop/pom.xml +++ b/controlloop/packages/docker-controlloop/pom.xml @@ -80,44 +80,6 @@ </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="src/main/docker/antrun/Dockerfile"> - <filterset> - <filter token="version.policy.drools-pdp" value="${version.policy.drools-pdp}"/> - </filterset> - </copy> - </tasks> - </configuration> - </execution> - <execution> - <id>cleanup-filtered-dockerfile</id> - <phase>process-sources</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <delete dir="src/main/docker/antrun"/> - </tasks> - </configuration> - </execution> - </executions> - </plugin> <plugin> <groupId>io.fabric8</groupId> <artifactId>docker-maven-plugin</artifactId> @@ -131,7 +93,6 @@ <name>onap/policy-pdpd-cl</name> <build> <cleanup>try</cleanup> - <contextDir>antrun</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 98bf35a8e..14e8c7400 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:@version.policy.drools-pdp@ +FROM onap/policy-drools:1.6-SNAPSHOT-latest ARG BUILD_VERSION_APP_CL=${BUILD_VERSION_APP_CL} ENV BUILD_VERSION_APP_CL=${BUILD_VERSION_APP_CL} |