From 8748204960458c019e66b4886c8cb54447c18c25 Mon Sep 17 00:00:00 2001
From: ford prior <108086978+ford-at-aws@users.noreply.github.com>
Date: Thu, 27 Jul 2023 10:01:42 -0600
Subject: [PATCH 1/4] Update Dockerfile

---
 javav2/Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/javav2/Dockerfile b/javav2/Dockerfile
index 76357e2dc33..cd7f6fde4ac 100644
--- a/javav2/Dockerfile
+++ b/javav2/Dockerfile
@@ -3,6 +3,6 @@
 # GA updates: https://github.com/awsdocs/aws-doc-sdk-examples/issues/4128
 FROM maven:latest
 COPY . /javav2/
-RUN cd /javav2/example_code/cloudwatch && \
-    mvn package -Dmaven.test.skip
-CMD ["bash"]
+# RUN cd /javav2/example_code/cloudwatch && \
+#     mvn package -Dmaven.test.skip
+CMD ["./run_tests.sh"]

From b695a91edbbeedfa455106d1a69029e740424129 Mon Sep 17 00:00:00 2001
From: ford prior <108086978+ford-at-aws@users.noreply.github.com>
Date: Thu, 27 Jul 2023 10:03:32 -0600
Subject: [PATCH 2/4] Update Dockerfile

---
 javav2/Dockerfile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/javav2/Dockerfile b/javav2/Dockerfile
index cd7f6fde4ac..ad98092c30b 100644
--- a/javav2/Dockerfile
+++ b/javav2/Dockerfile
@@ -3,6 +3,4 @@
 # GA updates: https://github.com/awsdocs/aws-doc-sdk-examples/issues/4128
 FROM maven:latest
 COPY . /javav2/
-# RUN cd /javav2/example_code/cloudwatch && \
-#     mvn package -Dmaven.test.skip
-CMD ["./run_tests.sh"]
+CMD ["cd javav2", "&&", "./run_tests.sh"]

From d491b313c481f35e9d57eb91a42c7085afe61d3b Mon Sep 17 00:00:00 2001
From: ford prior <108086978+ford-at-aws@users.noreply.github.com>
Date: Thu, 27 Jul 2023 10:47:59 -0600
Subject: [PATCH 3/4] Update run_test.sh

---
 javav2/run_test.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/javav2/run_test.sh b/javav2/run_test.sh
index f69dc3a23ce..387be71bfc2 100755
--- a/javav2/run_test.sh
+++ b/javav2/run_test.sh
@@ -23,5 +23,6 @@ if [[ ! -d "$root_dir" ]]; then
 fi
 
 echo "Starting mvn tests..."
+cd javav2
 run_mvn_tests "$root_dir"
 echo "mvn tests completed."

From c9ccb265e6d034ea06f0cba884f272434e8a1e99 Mon Sep 17 00:00:00 2001
From: ford prior <108086978+ford-at-aws@users.noreply.github.com>
Date: Thu, 27 Jul 2023 10:49:30 -0600
Subject: [PATCH 4/4] Update Dockerfile

---
 javav2/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/javav2/Dockerfile b/javav2/Dockerfile
index ad98092c30b..516314ad6a8 100644
--- a/javav2/Dockerfile
+++ b/javav2/Dockerfile
@@ -3,4 +3,4 @@
 # GA updates: https://github.com/awsdocs/aws-doc-sdk-examples/issues/4128
 FROM maven:latest
 COPY . /javav2/
-CMD ["cd javav2", "&&", "./run_tests.sh"]
+CMD ["./javav2/run_tests.sh"]