Merge branch 'main' into links

Author: mzellho

.github/pull_request_template.md

@@ -1,6 +1,8 @@
 <!--
-Thanks for contributing to Testcontainers. Please review the following notes before
-submitting a pull request.
+Thanks for contributing to Testcontainers. Before submitting a pull request, please
+review our contributing guidelines at https://java.testcontainers.org/contributing/
+
+Please also review the following notes before submitting a pull request.
 
 New Modules:
 

docs/modules/k6.md

@@ -11,12 +11,23 @@ Testcontainers module for [k6](https://registry.hub.docker.com/r/grafana/k6).
 
 ## Basic script execution
 
-Execute a simple k6 test script, `test.js`, with commandline options and injected script variable.
+You can start a K6 container instance from any Java application by using:
+
+<!--codeinclude-->
+[Setup the container](../../modules/k6/src/test/java/org/testcontainers/k6/K6ContainerTests.java) inside_block:standard_k6
+<!--/codeinclude-->
+
+The test above uses a simple k6 script, `test.js`, with command line options and an injected script variable.
+
+Once the container is started, you can wait for the test results to be collected:
+
+<!--codeinclude-->
+[Wait for test results](../../modules/k6/src/test/java/org/testcontainers/k6/K6ContainerTests.java) inside_block:wait
+<!--/codeinclude-->
 
 Create a simple k6 test script to be executed as part of your tests:
 
 <!--codeinclude-->
-[Setup the container](../../modules/k6/src/test/java/org/testcontainers/k6/K6ContainerTests.java) inside_block:standard_k6
 [Content of `scripts/test.js`](../../modules/k6/src/test/resources/scripts/test.js) inside_block:access_script_vars
 <!--/codeinclude-->
 

modules/k6/src/test/java/org/testcontainers/k6/K6ContainerTests.java

@@ -23,6 +23,7 @@ void k6StandardTest() throws Exception {
         ) {
             container.start();
 
+            // wait {
             WaitingConsumer consumer = new WaitingConsumer();
             container.followOutput(consumer);
 
@@ -34,6 +35,7 @@ void k6StandardTest() throws Exception {
                 3,
                 TimeUnit.SECONDS
             );
+            // }
 
             assertThat(container.getLogs()).contains("k6 tests are cool!");
         }