Răsfoiți Sursa

Use the image under test as the client image

It should already have `curl` in it since it's based on one of the java:jre images.
Mike Dillon 10 ani în urmă
părinte
comite
81da785764
1 a modificat fișierele cu 2 adăugiri și 5 ștergeri
  1. 2 5
      test/tests/jetty-hello-web/run.sh

+ 2 - 5
test/tests/jetty-hello-web/run.sh

@@ -6,11 +6,8 @@ dir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
 
 image="$1"
 
-# Pull a client image with curl for testing
-clientImage='buildpack-deps:jessie-curl'
-if ! docker inspect --type=image "$clientImage" &> /dev/null; then
-	docker pull "$clientImage"
-fi
+# Use the image being tested as our client image since it should already have curl
+clientImage="$image"
 
 # Create an instance of the container-under-test
 cid="$(docker run -d -v "$dir/index.jsp":/var/lib/jetty/webapps/ROOT/index.jsp:ro "$image")"