diff options
| author |   Steve Smokowski <ss835w@att.com> | 2017-02-20 21:51:40 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@openecomp.org> | 2017-02-20 21:51:40 +0000 |
| commit | 94584fa7509d00fc6f2f9730f38d70ee89f4eae6 (patch) | |
| tree | 4afc8de8ca9768ae3d217c286a24899dfc095d5b /ajsc-aai/pom.xml | |
| parent | ca2c2ff16da13cafd33e442c107c225766fd612e (diff) | |
| parent | e9c93760239e43db9b3ecd55d2d64ef9ef79d8dc (diff) | |
Merge "Change the docker profile back"
Diffstat (limited to 'ajsc-aai/pom.xml')
| -rw-r--r-- | ajsc-aai/pom.xml | 136 |
1 files changed, 64 insertions, 72 deletions
diff --git a/ajsc-aai/pom.xml b/ajsc-aai/pom.xml index c218414..78c8868 100644 --- a/ajsc-aai/pom.xml +++ b/ajsc-aai/pom.xml @@ -342,6 +342,70 @@ </dependencies> <build> <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <version>2.7</version> + <executions> + <execution> + <id>copy-docker-file</id> + <phase>package</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${dockerLocation}</outputDirectory> + <overwrite>true</overwrite> + <resources> + <resource> + <directory>${basedir}/src/main/resources/docker</directory> + <filtering>true</filtering> + <includes> + <include>**/*</include> + </includes> + </resource> + </resources> + </configuration> + </execution> + <execution> + <id>copy-commonlibs-file</id> + <phase>package</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${dockerLocation}/commonLibs</outputDirectory> + <overwrite>true</overwrite> + <resources> + <resource> + <directory>${basedir}/target/commonLibs</directory> + <filtering>false</filtering> + <includes> + <include>*.jar</include> + </includes> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>com.spotify</groupId> + <artifactId>docker-maven-plugin</artifactId> + <version>0.4.11</version> + <configuration> + <verbose>true</verbose> + + <imageName>${docker.push.registry}/openecomp/${project.artifactId}</imageName> + <dockerDirectory>${dockerLocation}</dockerDirectory> + <serverId>docker-hub</serverId> + <imageTags> + <imageTag>${docker_imageversion}</imageTag> + <imageTag>latest</imageTag> + </imageTags> + <forceTags>true</forceTags> + </configuration> + </plugin> <plugin> <groupId>org.jvnet.jaxb2.maven2</groupId> <artifactId>maven-jaxb2-plugin</artifactId> @@ -556,77 +620,5 @@ </plugins> </build> </profile> - <profile> - <id>docker</id> - <build> - <defaultGoal>docker:build</defaultGoal> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-resources-plugin</artifactId> - <version>2.7</version> - <executions> - <execution> - <id>copy-docker-file</id> - <phase>package</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${dockerLocation}</outputDirectory> - <overwrite>true</overwrite> - <resources> - <resource> - <directory>${basedir}/src/main/resources/docker</directory> - <filtering>true</filtering> - <includes> - <include>**/*</include> - </includes> - </resource> - </resources> - </configuration> - </execution> - <execution> - <id>copy-commonlibs-file</id> - <phase>package</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${dockerLocation}/commonLibs</outputDirectory> - <overwrite>true</overwrite> - <resources> - <resource> - <directory>${basedir}/target/commonLibs</directory> - <filtering>false</filtering> - <includes> - <include>*.jar</include> - </includes> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>com.spotify</groupId> - <artifactId>docker-maven-plugin</artifactId> - <version>0.4.11</version> - <configuration> - <verbose>true</verbose> - - <imageName>${docker.push.registry}/ecomp/${project.artifactId}</imageName> - <dockerDirectory>${dockerLocation}</dockerDirectory> - <serverId>docker-hub</serverId> - <imageTags> - <imageTag>${docker_imageversion}</imageTag> - <imageTag>latest</imageTag> - </imageTags> - <forceTags>true</forceTags> - </configuration> - </plugin> - </plugins> - </build> - </profile> </profiles> </project> |