aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnaël Closson <ac2550@intl.att.com>2017-02-14 11:17:50 +0100
committerAnaël Closson <ac2550@intl.att.com>2017-02-16 12:34:33 +0000
commit13e0d02854cc014c8d2a60a9e07f16f0acd99e08 (patch)
tree76843c2f3f51d5b5db472797b26f26168831f1f0
parentc6aecd46703503ac2b46b7dbe1781977a96ea5aa (diff)
Docker should clone config first
Mso-config and chef-config repos should be clone for docker image builds. Those repositories are taken from official openecomp.org repositories. Change-Id: I754472cc2e28c2ec2021b2c853566e12f8c9fe6b Signed-off-by: Anaël Closson <ac2550@intl.att.com>
-rw-r--r--packages/docker/pom.xml37
-rw-r--r--packages/docker/src/main/docker/docker-files/chef-configs/readme.md1
2 files changed, 37 insertions, 1 deletions
diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml
index 8129336108..f011618f5d 100644
--- a/packages/docker/pom.xml
+++ b/packages/docker/pom.xml
@@ -24,6 +24,43 @@
<finalName>${project.artifactId}-${project.version}</finalName>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-scm-plugin</artifactId>
+ <version>1.9.5</version>
+ <executions>
+ <execution>
+ <id>chef-repo-checkout</id>
+ <goals>
+ <goal>checkout</goal>
+ </goals>
+ <phase>initialize</phase>
+ <configuration>
+ <connectionUrl>scm:git:ssh://gerrit.openecomp.org:29418/mso/chef-repo</connectionUrl>
+ <checkoutDirectory>src/main/docker/docker-files/chef-configs/chef-repo</checkoutDirectory>
+ <scmVersion>master</scmVersion>
+ <scmVersionType>branch</scmVersionType>
+ <skipCheckoutIfExists>true</skipCheckoutIfExists>
+ <pushChanges>false</pushChanges>
+ </configuration>
+ </execution>
+ <execution>
+ <id>mso-config-checkout</id>
+ <goals>
+ <goal>checkout</goal>
+ </goals>
+ <phase>initialize</phase>
+ <configuration>
+ <connectionUrl>scm:git:ssh://gerrit.openecomp.org:29418/mso/mso-config</connectionUrl>
+ <checkoutDirectory>src/main/docker/docker-files/chef-configs/mso-config</checkoutDirectory>
+ <scmVersion>master</scmVersion>
+ <scmVersionType>branch</scmVersionType>
+ <skipCheckoutIfExists>true</skipCheckoutIfExists>
+ <pushChanges>false</pushChanges>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>0.16.5</version>
diff --git a/packages/docker/src/main/docker/docker-files/chef-configs/readme.md b/packages/docker/src/main/docker/docker-files/chef-configs/readme.md
deleted file mode 100644
index 6d42de8d23..0000000000
--- a/packages/docker/src/main/docker/docker-files/chef-configs/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-Please clone the 'chef-repo' and 'mso-config' repository here before building images.