Removed mysql from docker-compose

spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/pom.xml

@@ -100,29 +100,6 @@
 			<artifactId>spring-cloud-sleuth-sample-test-core</artifactId>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-databind</artifactId>
-			<version>${testcontainers.jackson.version}</version>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-core</artifactId>
-			<version>${testcontainers.jackson.version}</version>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-annotations</artifactId>
-			<version>${testcontainers.jackson.version}</version>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.testcontainers</groupId>
-			<artifactId>docker-compose</artifactId>
-			<scope>test</scope>
-		</dependency>
 	</dependencies>
 
 </project>

spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/src/test/java/integration/MessagingApplicationDockerTests.java

@@ -19,7 +19,6 @@ import com.twitter.zipkin.gen.BinaryAnnotation;
 import com.twitter.zipkin.gen.Span;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.After;
-import org.junit.ClassRule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,12 +28,10 @@ import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.util.JdkIdGenerator;
 import org.springframework.util.StringUtils;
-import org.testcontainers.containers.DockerComposeContainer;
 import sample.SampleMessagingApplication;
 import tools.AbstractDockerIntegrationTest;
 import tools.IntegrationTestSpanCollector;
 
-import java.io.File;
 import java.util.Collection;
 
 import static org.assertj.core.api.BDDAssertions.then;
@@ -50,11 +47,6 @@ public class MessagingApplicationDockerTests extends AbstractDockerIntegrationTe
 	private static String sampleAppUrl = "http://localhost:" + port;
 	@Autowired IntegrationTestSpanCollector integrationTestSpanCollector;
 
-	@ClassRule
-	public static DockerComposeContainer environment =
-			new DockerComposeContainer(new File("src/test/resources/docker-compose.yml"))
-					.withExposedService("rabbitmq_1", 5672);
-
 	@After
 	public void cleanup() {
 		integrationTestSpanCollector.hashedSpans.clear();

spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/src/test/resources/docker-compose.yml

@@ -1,5 +0,0 @@
-rabbitmq:
-  image: rabbitmq:management
-  ports:
-    - 5672:5672
-    - 15672:15672

spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/src/test/java/integration/ZipkinStreamDockerTests.java

@@ -23,6 +23,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.SpringApplicationConfiguration;
 import org.springframework.boot.test.WebIntegrationTest;
+import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.util.JdkIdGenerator;
 import org.testcontainers.containers.DockerComposeContainer;
@@ -33,8 +34,9 @@ import java.io.File;
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringApplicationConfiguration(classes = { SampleApp.Config.class,
 		AbstractDockerIntegrationTest.ZipkinConfig.class, ZipkinStreamServerApplication.class })
-@WebIntegrationTest()
+@WebIntegrationTest
 @Slf4j
+@ActiveProfiles("test")
 public class ZipkinStreamDockerTests extends AbstractDockerIntegrationTest {
 
 	private static int port = 9411;
@@ -44,8 +46,7 @@ public class ZipkinStreamDockerTests extends AbstractDockerIntegrationTest {
 	public static DockerComposeContainer environment =
 			new DockerComposeContainer(new File("src/test/resources/docker-compose.yml"))
 					.withExposedService("rabbitmq_1", 5672)
-					.withExposedService("rabbitmq_1", 15672)
+					.withExposedService("rabbitmq_1", 15672);
-					.withExposedService("mysql_1", 3306);
 
 	@Test
 	@SneakyThrows

spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/src/test/resources/application-test.yml

@@ -0,0 +1,3 @@
+zipkin:
+  store:
+    type: mem # default is inMemory

spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/src/test/resources/docker-compose.yml

@@ -1,11 +1,3 @@
-mysql:
-  image: mysql
-  ports:
-    - 3306:3306
-  environment:
-    - MYSQL_ROOT_PASSWORD=root
-    - MYSQL_DATABASE=test
-
 rabbitmq:
   image: rabbitmq:management
   ports:

spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/test/resources/docker-compose.yml

@@ -3,20 +3,7 @@ query:
   environment:
     # Remove TRANSPORT_TYPE to disable tracing
     - TRANSPORT_TYPE=http
-    - STORAGE_TYPE=mysql
+    - STORAGE_TYPE=sqlite-memory
   ports:
     - 9411:9411
-    - 9901:9901
+    - 9901:9901
-  links:
-    - mysql:storage
-
-rabbitmq:
-  image: rabbitmq:management
-  ports:
-    - 5672
-    - 15672
-
-mysql:
-  image: openzipkin/zipkin-mysql:1.30.0
-  ports:
-    - 3306:3306