summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiang Ding <liang.ding@intel.com>2019-09-06 01:48:33 -0700
committerLiang Ding <liang.ding@intel.com>2019-09-06 01:51:30 -0700
commita4fc17247a30cd1ba120a20048913096f4db08a8 (patch)
tree2a5f7e1db55f64249db5613ed92426063ccb19c6
parent30a131e644eadbf58d4cd0688fb8ecb7d3a519b6 (diff)
Fix copy-resource issue of artifactbroker
-- modification should be made in packages/pom.xml instead of the one in artifactbroker root Change-Id: Ic2f3209b3a2249f7bbba1f4e6f08f6f20d964dcf Issue-ID: MULTICLOUD-806 Signed-off-by: Liang Ding <liang.ding@intel.com>
-rw-r--r--artifactbroker/packages/docker/Dockerfile (renamed from artifactbroker/docker/Dockerfile)0
-rw-r--r--artifactbroker/packages/docker/artifact-dist.sh (renamed from artifactbroker/docker/artifact-dist.sh)0
-rwxr-xr-xartifactbroker/packages/docker/build_image.sh (renamed from artifactbroker/docker/build_image.sh)0
-rw-r--r--artifactbroker/packages/pom.xml85
-rw-r--r--artifactbroker/pom.xml85
5 files changed, 85 insertions, 85 deletions
diff --git a/artifactbroker/docker/Dockerfile b/artifactbroker/packages/docker/Dockerfile
index 364acb9..364acb9 100644
--- a/artifactbroker/docker/Dockerfile
+++ b/artifactbroker/packages/docker/Dockerfile
diff --git a/artifactbroker/docker/artifact-dist.sh b/artifactbroker/packages/docker/artifact-dist.sh
index 94c1dfc..94c1dfc 100644
--- a/artifactbroker/docker/artifact-dist.sh
+++ b/artifactbroker/packages/docker/artifact-dist.sh
diff --git a/artifactbroker/docker/build_image.sh b/artifactbroker/packages/docker/build_image.sh
index e082e9b..e082e9b 100755
--- a/artifactbroker/docker/build_image.sh
+++ b/artifactbroker/packages/docker/build_image.sh
diff --git a/artifactbroker/packages/pom.xml b/artifactbroker/packages/pom.xml
index c5d98e7..297b455 100644
--- a/artifactbroker/packages/pom.xml
+++ b/artifactbroker/packages/pom.xml
@@ -82,4 +82,89 @@
</plugin>
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>docker</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>3.1.0</version>
+ <executions>
+ <execution>
+ <id>copy-resources</id>
+ <phase>install</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <overwrite>true</overwrite>
+ <nonFilteredFileExtensions>
+ <nonFilteredFileExtension>zip</nonFilteredFileExtension>
+ <nonFilteredFileExtension>jar</nonFilteredFileExtension>
+ </nonFilteredFileExtensions>
+ <outputDirectory>${project.basedir}/docker_target</outputDirectory>
+ <resources>
+ <resource>
+ <directory>${project.basedir}/docker</directory>
+ <filtering>true</filtering>
+ </resource>
+ <resource>
+ <directory>${project.basedir}/target</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>*.zip</include>
+ <include>*.jar</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.6</version>
+ <executions>
+ <execution>
+ <phase>install</phase>
+ <inherited>false</inherited>
+ <configuration>
+ <target>
+ <exec executable="docker">
+ <arg value="build"/>
+ <arg value="-t"/>
+ <arg value="${CONTAINER_PUSH_REGISTRY}/onap/multicloud/framework-artifactbroker:${project.version}"/>
+ <arg value="docker_target"/>
+ </exec>
+ <exec executable="docker">
+ <arg value="tag"/>
+ <arg value="${CONTAINER_PUSH_REGISTRY}/onap/multicloud/framework-artifactbroker:${project.version}"/>
+ <arg value="${CONTAINER_PUSH_REGISTRY}/onap/multicloud/framework-artifactbroker:latest"/>
+ </exec>
+ <exec executable="docker">
+ <arg value="push"/>
+ <arg value="${CONTAINER_PUSH_REGISTRY}/onap/multicloud/framework-artifactbroker:${project.version}"/>
+ </exec>
+ <exec executable="docker">
+ <arg value="push"/>
+ <arg value="${CONTAINER_PUSH_REGISTRY}/onap/multicloud/framework-artifactbroker:latest"/>
+ </exec>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ </profile>
+ </profiles>
</project>
diff --git a/artifactbroker/pom.xml b/artifactbroker/pom.xml
index 66cb5da..ef01d80 100644
--- a/artifactbroker/pom.xml
+++ b/artifactbroker/pom.xml
@@ -226,89 +226,4 @@
</plugins>
</pluginManagement>
</build>
- <profiles>
- <profile>
- <id>docker</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>3.1.0</version>
- <executions>
- <execution>
- <id>copy-resources</id>
- <phase>install</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <overwrite>true</overwrite>
- <nonFilteredFileExtensions>
- <nonFilteredFileExtension>zip</nonFilteredFileExtension>
- <nonFilteredFileExtension>jar</nonFilteredFileExtension>
- </nonFilteredFileExtensions>
- <outputDirectory>${project.basedir}/docker_target</outputDirectory>
- <resources>
- <resource>
- <directory>${project.basedir}/docker</directory>
- <filtering>true</filtering>
- </resource>
- <resource>
- <directory>${project.basedir}/packages/target</directory>
- <filtering>true</filtering>
- <includes>
- <include>*.zip</include>
- <include>*.jar</include>
- </includes>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.6</version>
- <executions>
- <execution>
- <phase>install</phase>
- <inherited>false</inherited>
- <configuration>
- <target>
- <exec executable="docker">
- <arg value="build"/>
- <arg value="-t"/>
- <arg value="${CONTAINER_PUSH_REGISTRY}/onap/multicloud/framework-artifactbroker:${project.version}"/>
- <arg value="docker_target"/>
- </exec>
- <exec executable="docker">
- <arg value="tag"/>
- <arg value="${CONTAINER_PUSH_REGISTRY}/onap/multicloud/framework-artifactbroker:${project.version}"/>
- <arg value="${CONTAINER_PUSH_REGISTRY}/onap/multicloud/framework-artifactbroker:latest"/>
- </exec>
- <exec executable="docker">
- <arg value="push"/>
- <arg value="${CONTAINER_PUSH_REGISTRY}/onap/multicloud/framework-artifactbroker:${project.version}"/>
- </exec>
- <exec executable="docker">
- <arg value="push"/>
- <arg value="${CONTAINER_PUSH_REGISTRY}/onap/multicloud/framework-artifactbroker:latest"/>
- </exec>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- </profile>
- </profiles>
</project>