summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorInstrumental <jonathan.gathman@att.com>2019-08-02 15:54:29 -0500
committerInstrumental <jonathan.gathman@att.com>2019-08-02 15:55:22 -0500
commit2e84bc99049aa25107df4f045894059321bf4b3d (patch)
treeae4d0092253d16cf147d3040bca73615eff4c1db
parente9ae04800c417330c3e1c5dae45744f819f41130 (diff)
Make Docker build from Root Maven
Issue-ID: AAF-917 Change-Id: Ieeac6254a626a4de42e6f082b727ec52fe9bb194 Signed-off-by: Instrumental <jonathan.gathman@att.com>
-rw-r--r--.gitignore1
-rw-r--r--auth/docker/pom.xml2
-rw-r--r--pom.xml39
3 files changed, 41 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 600c50d4..8259e7e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
.metadata/
/cadisample/
.classpath
+/bin/
diff --git a/auth/docker/pom.xml b/auth/docker/pom.xml
index 540513e7..add4e964 100644
--- a/auth/docker/pom.xml
+++ b/auth/docker/pom.xml
@@ -32,7 +32,6 @@
<artifactId>aaf-auth-docker</artifactId>
<name>AAF Docker Build</name>
<description>Docker Build</description>
- <!-- Build Docker with "cd < this dir>; mvn -N exec:exec -Pbuild-docker -->
<profiles>
<profile>
@@ -52,6 +51,7 @@
</execution>
</executions>
<configuration>
+ <skip>false</skip>
<executable>bash</executable>
<commandlineArgs>-c "pwd; bash dbuild.sh"</commandlineArgs>
</configuration>
diff --git a/pom.xml b/pom.xml
index 5e6c3586..9937297b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -368,4 +368,43 @@
<url>dav:${nexusproxy}${sitePath}</url>
</site>
</distributionManagement>
+
+ <profiles>
+ <profile>
+ <id>build-docker</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.6.0</version>
+ <executions>
+ <execution>
+ <id>Docker Build</id>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <skip>true</skip>
+ <executable>bash</executable>
+ <commandlineArgs>echo "No Docker Here"</commandlineArgs>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.sonarsource.scanner.maven</groupId>
+ <artifactId>sonar-maven-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <modules>
+ <module>auth/docker</module>
+ </modules>
+ </profile>
+ </profiles>
</project>