Skip to content

Commit

Permalink
Fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@Angular2Guy
Angular2Guy committed May 17, 2018
1 parent 327285f commit 3417c32
Show file tree
Hide file tree
Showing 3 changed files with 66 additions and 45 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ before_install:


script:
mvn clean install dockerfile:build
mvn clean install
103 changes: 62 additions & 41 deletions carrental-ear/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,26 +127,37 @@
<build>
<plugins>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
<executions>
<!--
<execution>
<id>default</id>
<goals>
<goal>build</goal>
<goal>push</goal>
</goals>
</execution>
-->
</executions>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<configuration>
<contextDirectory>${project.basedir}</contextDirectory>
<repository>angular2guy/carrental</repository>
<tag>${project.version}</tag>
<buildArgs>
<JAR_FILE>${project.build.finalName}.ear</JAR_FILE>
</buildArgs>
<images>
<image>
<alias>carrental</alias>
<name>carrental:${project.version}</name>
<build>
<dockerFile>${project.basedir}/Dockerfile</dockerFile>
<ports>
<port>8080</port>
</ports>
</build>

<run>
<ports>
<port>8080:8080</port>
</ports>
<log>
<enabled>true</enabled>
<prefix>Wildfly</prefix>
</log>
<wait>
<http>
<url>http://localhost:8080/carrental-web/</url>
</http>
<time>30000</time>
</wait>
</run>
</image>
</images>
</configuration>
</plugin>
</plugins>
Expand All @@ -164,29 +175,39 @@
<build>
<plugins>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
<executions>
<!--
<execution>
<id>default</id>
<goals>
<goal>build</goal>
<goal>push</goal>
</goals>
</execution>
-->
</executions>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<configuration>
<contextDirectory>${project.basedir}</contextDirectory>
<dockerConfigFile>${project.basedir}/Dockerfile-ws</dockerConfigFile>
<repository>angular2guy/carrentalWS</repository>
<tag>${project.version}</tag>
<buildArgs>
<JAR_FILE>${project.build.finalName}.ear</JAR_FILE>
</buildArgs>
<images>
<image>
<alias>carrentalws</alias>
<name>carrentalws:${project.version}</name>
<build>
<dockerFile>${project.basedir}/Dockerfile-ws</dockerFile>
<ports>
<port>9080</port>
</ports>
</build>

<run>
<ports>
<port>9080:9080</port>
</ports>
<log>
<enabled>true</enabled>
<prefix>WS</prefix>
</log>
<wait>
<http>
<url>http://localhost:9080/carrental-web/</url>
</http>
<time>60000</time>
</wait>
</run>
</image>
</images>
</configuration>
</plugin>
</plugin>
</plugins>
</build>
</profile>
Expand Down Expand Up @@ -214,4 +235,4 @@
</profile>
</profiles>

</project>
</project>
6 changes: 3 additions & 3 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,9 @@
</configuration>
</plugin>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
<version>1.4.0</version>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>0.24.0</version>
</plugin>
</plugins>
</pluginManagement>
Expand Down

0 comments on commit 3417c32

Please sign in to comment.