Merge remote-tracking branch 'remotes/origin/release/V3.0.0.x' into merge-3.0/Merge3.0.0.xTo3.0_no

This commit is contained in:
cagache
2018-10-01 16:42:26 +03:00

View File

@@ -289,7 +289,7 @@
</build> </build>
</profile> </profile>
<!-- Profile used to build docker images with given tag and push them to the given image registry (quay.io) --> <!-- Profile used to build docker images with a specific tag and push them to the given image registry (quay.io)-->
<profile> <profile>
<id>internal</id> <id>internal</id>
<build> <build>
@@ -326,7 +326,7 @@
</build> </build>
</profile> </profile>
<!-- Profile used to build and push docker images with latest tag to the given image registry (quay.io) and <!-- Profile used to build and push docker images with a specific tag to the given image registry (quay.io) and
hub.docker --> hub.docker -->
<profile> <profile>
<id>master</id> <id>master</id>
@@ -340,14 +340,14 @@
<configuration> <configuration>
<images> <images>
<image> <image>
<name>${image.name}</name> <name>${image.name}:${image.tag}</name>
<registry>${image.registry}</registry> <registry>${image.registry}</registry>
<build> <build>
<dockerFileDir>${project.basedir}/</dockerFileDir> <dockerFileDir>${project.basedir}/</dockerFileDir>
</build> </build>
</image> </image>
<image> <image>
<name>${image.name}</name> <name>${image.name}:${image.tag}</name>
<build> <build>
<dockerFileDir>${project.basedir}/</dockerFileDir> <dockerFileDir>${project.basedir}/</dockerFileDir>
</build> </build>