DBZ-157 Upgraded Docker Maven plugin

Upgraded the Docker Maven plugin to 0.18.1, which required changing our use of the `docker.image` to `docker.filter` (per the [changes in 0.17.1](https://github.com/fabric8io/docker-maven-plugin/blob/master/doc/changelog.md)).
This commit is contained in:
Randall Hauch 2016-11-22 09:21:02 -06:00
parent e5e56d0252
commit 0bf3b4c9f3
2 changed files with 8 additions and 8 deletions

View File

@ -92,7 +92,7 @@
By default, we should use the docker image maintained by the MySQL team. This property is changed with different profiles. By default, we should use the docker image maintained by the MySQL team. This property is changed with different profiles.
However, we run one container with GTIDs and one without. However, we run one container with GTIDs and one without.
--> -->
<docker.image>debezium/mysql-server-test-database</docker.image> <docker.filter>debezium/mysql-server-test-database</docker.filter>
<docker.skip>false</docker.skip> <docker.skip>false</docker.skip>
</properties> </properties>
<build> <build>
@ -506,7 +506,7 @@
</activation> </activation>
<properties> <properties>
<!-- Run multiple images at the same time, but use different ports for all MySQL servers --> <!-- Run multiple images at the same time, but use different ports for all MySQL servers -->
<docker.image>debezium/mysql-server-test-database,debezium/mysql-server-gtids-test-database,debezium/mysql-server-gtids-test-database-replica,debezium/mysql-test-alt-database,debezium/mysql-test-alt-database-gtids,debezium/mysql-test-alt-database-gtids-replica</docker.image> <docker.filter>debezium/mysql-server-test-database,debezium/mysql-server-gtids-test-database,debezium/mysql-server-gtids-test-database-replica,debezium/mysql-test-alt-database,debezium/mysql-test-alt-database-gtids,debezium/mysql-test-alt-database-gtids-replica</docker.filter>
<database.port>3306</database.port> <database.port>3306</database.port>
<database.gtid.port>4306</database.gtid.port> <database.gtid.port>4306</database.gtid.port>
<database.gtid.replica.port>5306</database.gtid.replica.port> <database.gtid.replica.port>5306</database.gtid.replica.port>
@ -661,7 +661,7 @@
</property> </property>
</activation> </activation>
<properties> <properties>
<docker.image>debezium/mysql-server-gtids-test-database</docker.image> <docker.filter>debezium/mysql-server-gtids-test-database</docker.filter>
</properties> </properties>
</profile> </profile>
<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@ -677,7 +677,7 @@
</property> </property>
</activation> </activation>
<properties> <properties>
<docker.image>debezium/mysql-test-alt-database</docker.image> <docker.filter>debezium/mysql-test-alt-database</docker.filter>
</properties> </properties>
</profile> </profile>
<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@ -693,7 +693,7 @@
</property> </property>
</activation> </activation>
<properties> <properties>
<docker.image>debezium/mysql-test-alt-database-gtids</docker.image> <docker.filter>debezium/mysql-test-alt-database-gtids</docker.filter>
</properties> </properties>
</profile> </profile>
<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@ -712,7 +712,7 @@
</activation> </activation>
<properties> <properties>
<database.replica.port>4306</database.replica.port> <database.replica.port>4306</database.replica.port>
<docker.image>debezium/mysql-server-gtids-test-database,debezium/mysql-server-gtids-test-database-replica</docker.image> <docker.filter>debezium/mysql-server-gtids-test-database,debezium/mysql-server-gtids-test-database-replica</docker.filter>
</properties> </properties>
</profile> </profile>
<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@ -731,7 +731,7 @@
</activation> </activation>
<properties> <properties>
<database.replica.port>4306</database.replica.port> <database.replica.port>4306</database.replica.port>
<docker.image>debezium/mysql-test-alt-database-gtids,debezium/mysql-test-alt-database-gtids-replica</docker.image> <docker.filter>debezium/mysql-test-alt-database-gtids,debezium/mysql-test-alt-database-gtids-replica</docker.filter>
</properties> </properties>
</profile> </profile>
</profiles> </profiles>

View File

@ -79,7 +79,7 @@
<version.war.plugin>2.5</version.war.plugin> <version.war.plugin>2.5</version.war.plugin>
<version.codehaus.helper.plugin>1.8</version.codehaus.helper.plugin> <version.codehaus.helper.plugin>1.8</version.codehaus.helper.plugin>
<version.google.formatter.plugin>0.3.1</version.google.formatter.plugin> <version.google.formatter.plugin>0.3.1</version.google.formatter.plugin>
<version.docker.maven.plugin>0.16.8</version.docker.maven.plugin> <version.docker.maven.plugin>0.18.1</version.docker.maven.plugin>
<version.staging.plugin>1.6.3</version.staging.plugin> <version.staging.plugin>1.6.3</version.staging.plugin>
<!-- Dockerfiles --> <!-- Dockerfiles -->