forked from hygieia/hygieia
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request hygieia#321 from jimzucker/mergecollector
Merge Collector DockerFile changes to master
- Loading branch information
Showing
28 changed files
with
1,117 additions
and
800 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -38,3 +38,6 @@ logs | |
| # Eclipse specific ignore settings | ||
| .settings/ | ||
| .project | ||
| .pmdruleset.xml | ||
| .pmd | ||
| .classpath | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,100 +1,101 @@ | ||
| <project xmlns="https://maven.apache.org/POM/4.0.0" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <artifactId>UI</artifactId> | ||
| <packaging>pom</packaging> | ||
| <name>${project.groupId}:${project.artifactId}</name> | ||
| <description>Hygieia UI module</description> | ||
| <url>https://github.com/capitalone/Hygieia</url> | ||
| <project xmlns="https://maven.apache.org/POM/4.0.0" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <artifactId>UI</artifactId> | ||
| <packaging>pom</packaging> | ||
| <name>${project.groupId}:${project.artifactId}</name> | ||
| <description>Hygieia UI module</description> | ||
| <url>https://github.com/capitalone/Hygieia</url> | ||
|
|
||
| <parent> | ||
| <groupId>com.capitalone.dashboard</groupId> | ||
| <artifactId>Hygieia</artifactId> | ||
| <version>1.5.0-SNAPSHOT</version> | ||
| </parent> | ||
| <parent> | ||
| <groupId>com.capitalone.dashboard</groupId> | ||
| <artifactId>Hygieia</artifactId> | ||
| <version>1.5.0-SNAPSHOT</version> | ||
| </parent> | ||
|
|
||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>com.github.eirslett</groupId> | ||
| <artifactId>frontend-maven-plugin</artifactId> | ||
| <!-- if you have issues with your proxy, be careful https://github.com/eirslett/frontend-maven-plugin/commit/bcd8a7883703e28e3c5346e1f34c64332994e442 --> | ||
| <version>0.0.25</version> | ||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>com.github.eirslett</groupId> | ||
| <artifactId>frontend-maven-plugin</artifactId> | ||
| <!-- if you have issues with your proxy, be careful https://github.com/eirslett/frontend-maven-plugin/commit/bcd8a7883703e28e3c5346e1f34c64332994e442 --> | ||
| <version>0.0.25</version> | ||
|
|
||
| <configuration> | ||
| <workingDirectory>./</workingDirectory> | ||
| </configuration> | ||
| <configuration> | ||
| <workingDirectory>./</workingDirectory> | ||
| </configuration> | ||
|
|
||
| <executions> | ||
| <executions> | ||
|
|
||
| <execution> | ||
| <id>install node and npm</id> | ||
| <goals> | ||
| <goal>install-node-and-npm</goal> | ||
| </goals> | ||
| <configuration> | ||
| <nodeVersion>v0.12.0</nodeVersion> | ||
| <npmVersion>2.7.1</npmVersion> | ||
| </configuration> | ||
| </execution> | ||
| <execution> | ||
| <id>install node and npm</id> | ||
| <goals> | ||
| <goal>install-node-and-npm</goal> | ||
| </goals> | ||
| <configuration> | ||
| <nodeVersion>v0.12.0</nodeVersion> | ||
| <npmVersion>2.7.1</npmVersion> | ||
| </configuration> | ||
| </execution> | ||
|
|
||
| <execution> | ||
| <id>npm install</id> | ||
| <goals> | ||
| <goal>npm</goal> | ||
| </goals> | ||
| <!-- Optional configuration which provides for running any npm command --> | ||
| <configuration> | ||
| <arguments>install</arguments> | ||
| </configuration> | ||
| </execution> | ||
| <execution> | ||
| <id>npm install</id> | ||
| <goals> | ||
| <goal>npm</goal> | ||
| </goals> | ||
| <!-- Optional configuration which provides for running any npm command --> | ||
| <configuration> | ||
| <arguments>install</arguments> | ||
| </configuration> | ||
| </execution> | ||
|
|
||
| <execution> | ||
| <id>bower install</id> | ||
| <goals> | ||
| <goal>bower</goal> | ||
| </goals> | ||
| <configuration> | ||
| <arguments>install</arguments> | ||
| </configuration> | ||
| </execution> | ||
| <execution> | ||
| <id>bower install</id> | ||
| <goals> | ||
| <goal>bower</goal> | ||
| </goals> | ||
| <configuration> | ||
| <arguments>install</arguments> | ||
| </configuration> | ||
| </execution> | ||
|
|
||
| <execution> | ||
| <id>gulp build</id> | ||
| <goals> | ||
| <goal>gulp</goal> | ||
| </goals> | ||
| <execution> | ||
| <id>gulp build</id> | ||
| <goals> | ||
| <goal>gulp</goal> | ||
| </goals> | ||
|
|
||
| <!-- optional: the default phase is "generate-resources" --> | ||
| <phase>generate-resources</phase> | ||
| <!-- optional: the default phase is "generate-resources" --> | ||
| <phase>generate-resources</phase> | ||
|
|
||
| <configuration> | ||
| <!-- optional: if not specified, it will run gulp's default | ||
| task (and you can remove this whole <configuration> section.) --> | ||
| <arguments>build</arguments> | ||
| </configuration> | ||
| </execution> | ||
| <configuration> | ||
| <!-- optional: if not specified, it will run gulp's default task (and | ||
| you can remove this whole <configuration> section.) --> | ||
| <arguments>build</arguments> | ||
| </configuration> | ||
| </execution> | ||
|
|
||
| </executions> | ||
| </executions> | ||
|
|
||
| </plugin> | ||
| <plugin> | ||
| <groupId>com.spotify</groupId> | ||
| <artifactId>docker-maven-plugin</artifactId> | ||
| <version>0.3.3</version> | ||
| <configuration> | ||
| <imageName>hygieia-ui</imageName> | ||
| <dockerDirectory>${project.basedir}/docker</dockerDirectory> | ||
| <resources> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>com.spotify</groupId> | ||
| <artifactId>docker-maven-plugin</artifactId> | ||
| <configuration> | ||
| <skipDockerBuild>false</skipDockerBuild> | ||
| <imageName>hygieia-ui</imageName> | ||
| <dockerDirectory>${project.basedir}/docker</dockerDirectory> | ||
| <resources> | ||
|
|
||
| <resource> | ||
| <targetPath>html</targetPath> | ||
| <directory>${project.basedir}/dist</directory> | ||
| <include>*/**</include> | ||
| </resource> | ||
| <resource> | ||
| <targetPath>html</targetPath> | ||
| <directory>${project.basedir}/dist</directory> | ||
| <include>*/**</include> | ||
| </resource> | ||
|
|
||
| </resources> | ||
| </configuration> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| </resources> | ||
| </configuration> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| </project> |
Oops, something went wrong.