From 7cde96e8b66790857af24bc990dcdd743b0821ef Mon Sep 17 00:00:00 2001
From: Guillaume Tardif <guillaume.tardif@docker.com>
Date: Wed, 1 Jul 2020 14:59:23 +0200
Subject: [PATCH 1/2] Update guava to fix CVE

---
 tests/composefiles/aci-demo/words/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/composefiles/aci-demo/words/pom.xml b/tests/composefiles/aci-demo/words/pom.xml
index 088b4469..eb12f155 100644
--- a/tests/composefiles/aci-demo/words/pom.xml
+++ b/tests/composefiles/aci-demo/words/pom.xml
@@ -88,7 +88,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>23.0</version>
+            <version>29.0-jre</version>
         </dependency>
         <dependency>
             <groupId>org.postgresql</groupId>

From 8bdb4dee77f0cd0fb3d751c51fcbf8d1c5c67af9 Mon Sep 17 00:00:00 2001
From: Guillaume Tardif <guillaume.tardif@docker.com>
Date: Wed, 1 Jul 2020 14:59:45 +0200
Subject: [PATCH 2/2] Remove debug stuff from web images, that is causing
 apt-get install issues

---
 tests/composefiles/aci-demo/web/Dockerfile | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tests/composefiles/aci-demo/web/Dockerfile b/tests/composefiles/aci-demo/web/Dockerfile
index 341e5383..2dd000ae 100644
--- a/tests/composefiles/aci-demo/web/Dockerfile
+++ b/tests/composefiles/aci-demo/web/Dockerfile
@@ -16,8 +16,6 @@ ENV PATH $PATH:/usr/local/go/bin
 COPY dispatcher.go .
 RUN go build dispatcher.go
 
-RUN apt-get install curl && apt-get install dnsutils -y
-
 EXPOSE 80
 CMD ["/dispatcher"]