Merge branch '2.3.x'

Closes gh-24108

spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/DockerImageNames.java

@@ -0,0 +1,112 @@
+/*
+ * Copyright 2012-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.testsupport.testcontainers;
+
+import org.testcontainers.utility.DockerImageName;
+
+/**
+ * Create {@link DockerImageName} instances for services used in integration tests.
+ *
+ * @author Stephane Nicoll
+ * @since 2.3.6
+ */
+public final class DockerImageNames {
+
+	private static final String CASSANDRA_VERSION = "3.11.2";
+
+	private static final String COUCHBASE_VERSION = "6.5.1";
+
+	private static final String MONGO_VERSION = "4.0.10";
+
+	private static final String NEO4J_VERSION = "4.0";
+
+	private static final String POSTGRESQL_VERSION = "9.6.12";
+
+	private static final String REDIS_VERSION = "4.0.6";
+
+	private static final String REGISTRY_VERSION = "2.7.1";
+
+	private DockerImageNames() {
+	}
+
+	/**
+	 * Return a {@link DockerImageName} suitable for running Cassandra.
+	 * @return a docker image name for running cassandra
+	 */
+	public static DockerImageName cassandra() {
+		return new DockerImageName("cassandra", CASSANDRA_VERSION);
+	}
+
+	/**
+	 * Return a {@link DockerImageName} suitable for running Cassandra.
+	 * @return a docker image name for running cassandra
+	 */
+	public static DockerImageName couchbase() {
+		return new DockerImageName("couchbase/server", COUCHBASE_VERSION);
+	}
+
+	/**
+	 * Return a {@link DockerImageName} suitable for running Elasticsearch according to
+	 * the version available on the classpath.
+	 * @return a docker image name for running elasticsearch
+	 */
+	public static DockerImageName elasticsearch() {
+		String version = org.elasticsearch.Version.CURRENT.toString();
+		return new DockerImageName("docker.elastic.co/elasticsearch/elasticsearch", version);
+	}
+
+	/**
+	 * Return a {@link DockerImageName} suitable for running Mongo.
+	 * @return a docker image name for running mongo
+	 */
+	public static DockerImageName mongo() {
+		return new DockerImageName("mongo", MONGO_VERSION);
+	}
+
+	/**
+	 * Return a {@link DockerImageName} suitable for running Neo4j.
+	 * @return a docker image name for running neo4j
+	 */
+	public static DockerImageName neo4j() {
+		return new DockerImageName("neo4j", NEO4J_VERSION);
+	}
+
+	/**
+	 * Return a {@link DockerImageName} suitable for running PostgreSQL.
+	 * @return a docker image name for running postgresql
+	 */
+	public static DockerImageName postgresql() {
+		return new DockerImageName("postgres", POSTGRESQL_VERSION);
+	}
+
+	/**
+	 * Return a {@link DockerImageName} suitable for running Redis.
+	 * @return a docker image name for running redis
+	 */
+	public static DockerImageName redis() {
+		return new DockerImageName("redis", REDIS_VERSION);
+	}
+
+	/**
+	 * Return a {@link DockerImageName} suitable for running a Docker registry.
+	 * @return a docker image name for running a registry
+	 */
+	public static DockerImageName registry() {
+		return new DockerImageName("registry", REGISTRY_VERSION);
+	}
+
+}

spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/RedisContainer.java

@@ -28,7 +28,7 @@ import org.testcontainers.containers.GenericContainer;
 public class RedisContainer extends GenericContainer<RedisContainer> {
 
 	public RedisContainer() {
-		super("redis:4.0.6");
+		super(DockerImageNames.redis().toString());
 		addExposedPorts(6379);
 	}