diff options
| author |   Dmitry Puzikov <dmitry.puzikov@tieto.com> | 2019-04-15 11:57:14 +0200 |
|---|---|---|
| committer |   James Forsyth <jf2512@att.com> | 2019-08-28 20:34:41 +0000 |
| commit | d1aa1794560b997e230287643f478fe3ad02a5d8 (patch) | |
| tree | 504b8ff738ae22b8dacb7702a50057a486098c0b /aai-schema-service/pom.xml | |
| parent | 98126eab3ee49574be8cfc0cd61a23a82fdc4c07 (diff) | |
Fixed Dockerfile to reflect new base image name
Dockerfile has been changed to reflect new
aai-common image naming scheme.
Added maven parameter for aai-common image version.
Change-Id: I6d1a332ca049676059ccd29031aa7cfb4a95bb5c
Issue-ID: INT-803
Signed-off-by: Dmitry Puzikov <dmitry.puzikov@tieto.com>
Diffstat (limited to 'aai-schema-service/pom.xml')
| -rw-r--r-- | aai-schema-service/pom.xml | 31 |
1 files changed, 30 insertions, 1 deletions
diff --git a/aai-schema-service/pom.xml b/aai-schema-service/pom.xml index 41151c8..874d6eb 100644 --- a/aai-schema-service/pom.xml +++ b/aai-schema-service/pom.xml @@ -61,7 +61,7 @@ <eclipse.persistence.version>2.6.2</eclipse.persistence.version> <!-- End of Application Dependencies --> - <docker.fabric.version>0.23.0</docker.fabric.version> + <docker.fabric.version>0.28.0</docker.fabric.version> <!-- Default docker registry that maven fabric plugin will try to pull from --> <docker.registry>docker.io</docker.registry> <!-- Specifying the docker push registry where the image should be pushed --> @@ -75,6 +75,8 @@ <aai.build.directory>${project.build.directory}/${project.artifactId}-${project.version}-build/ </aai.build.directory> <aai.docker.namespace>onap</aai.docker.namespace> + <aai.base.image>alpine</aai.base.image> + <aai.base.image.version>1.6.0</aai.base.image.version> <maven.skip.tests>true</maven.skip.tests> @@ -108,6 +110,33 @@ <build> <plugins> <plugin> + <groupId>org.codehaus.groovy.maven</groupId> + <artifactId>gmaven-plugin</artifactId> + <version>1.0</version> + <executions> + <execution> + <phase>prepare-package</phase> + <goals> + <goal>execute</goal> + </goals> + <configuration> + <source> + def userAaiBaseImage = session.userProperties['aai.base.image']; + def userAaiCommonVersion = session.userProperties['aai.base.image.version']; + if (userAaiCommonVersion != null) { + project.properties['aai.base.image.version'] = userAaiCommonVersion; + } + if (userAaiBaseImage != null) { + project.properties['aai.base.image'] = userAaiBaseImage; + } + log.info 'Base image flavour: ' + project.properties['aai.base.image']; + log.info 'Base image version: ' + project.properties['aai.base.image.version']; + </source> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <groupId>io.fabric8</groupId> <artifactId>docker-maven-plugin</artifactId> <version>${docker.fabric.version}</version> |