Merge pull request docker-library#7367 from infosiftr/entrypoint

tianon · web-flow · commit 98ae9ef3b1e6 · 2020-01-29T14:50:38.000-08:00
Standardize test curl image; update to buster
diff --git a/test/tests/cassandra-basics/run.sh b/test/tests/cassandra-basics/run.sh
@@ -8,7 +8,7 @@ dir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
 
 image="$1"
 
-# Use the image being tested as our client image since it should already have curl
+# Use the image being tested as our client image
 clientImage="$image"
 
 # Create an instance of the container-under-test
@@ -27,7 +27,11 @@ trap "docker rm -vf $cid > /dev/null" EXIT
 trap "( set -x; docker logs --tail=20 $cid )" ERR
 
 _status() {
-	docker run --rm --link "$cid":cassandra "$clientImage" nodetool -h cassandra status
+	docker run --rm \
+		--link "$cid":cassandra \
+		--entrypoint nodetool \
+		"$clientImage" \
+		-h cassandra status
 }
 
 # Make sure our container is up
@@ -36,8 +40,9 @@ _status() {
 cqlsh() {
 	docker run -i --rm \
 		--link "$cid":cassandra \
+		--entrypoint cqlsh \
 		"$clientImage" \
-		cqlsh -u cassandra -p cassandra "$@" cassandra
+		-u cassandra -p cassandra "$@" cassandra
 }
 
 # Make sure our container is listening
diff --git a/test/tests/convertigo-hello-world/run.sh b/test/tests/convertigo-hello-world/run.sh
@@ -3,13 +3,11 @@ set -eo pipefail
 
 dir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
 
-image="$1"
-
-# since we have curl in the convertigo image, we'll use that
-clientImage="$1"
-
 serverImage="$1"
 
+# Use a client image with curl for testing
+clientImage='buildpack-deps:buster-curl'
+
 # Create an instance of the container-under-test
 cid="$(docker run -d "$serverImage")"
 trap "docker rm -vf $cid > /dev/null" EXIT
@@ -18,7 +16,9 @@ _request() {
 	local url="${1#/}"
 	shift
 
-	docker run --rm --link "$cid":convertigo "$clientImage" \
+	docker run --rm \
+		--link "$cid":convertigo \
+		"$clientImage" \
 		curl -s "$@" "http://convertigo:28080/$url"
 }
 
diff --git a/test/tests/elasticsearch-basics/run.sh b/test/tests/elasticsearch-basics/run.sh
@@ -8,8 +8,8 @@ dir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
 
 image="$1"
 
-# our image may not have "curl" (Alpine variants, for example)
-clientImage='buildpack-deps:stretch-curl'
+# Use a client image with curl for testing
+clientImage='buildpack-deps:buster-curl'
 
 # Create an instance of the container-under-test
 # (explicitly setting a low memory limit since the image defaults to 2GB)
@@ -27,7 +27,8 @@ _request() {
 	# https://github.com/docker/docker/issues/14203#issuecomment-129865960 (DOCKER_FIX)
 	docker run --rm --link "$cid":es \
 		-e DOCKER_FIX='                                        ' \
-		"$clientImage" curl -fs -X"$method" "$@" "http://es:9200/$url"
+		"$clientImage" \
+		curl -fs -X"$method" "$@" "http://es:9200/$url"
 }
 
 _trimmed() {
diff --git a/test/tests/ghost-basics/run.sh b/test/tests/ghost-basics/run.sh
@@ -6,7 +6,7 @@ dir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
 serverImage="$1"
 
 # Use a client image with curl for testing
-clientImage='buildpack-deps:stretch-curl'
+clientImage='buildpack-deps:buster-curl'
 
 # Create an instance of the container-under-test
 cid="$(docker run -d "$serverImage")"
@@ -19,7 +19,9 @@ _request() {
 	local url="${1}"
 	shift
 
-	docker run --rm --link "$cid":ghost "$clientImage" \
+	docker run --rm \
+		--link "$cid":ghost \
+		"$clientImage" \
 		curl -fs -X"$method" "$@" "http://ghost:2368/$url"
 }
 
diff --git a/test/tests/haproxy-basics/run.sh b/test/tests/haproxy-basics/run.sh
@@ -8,7 +8,7 @@ dir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
 
 image="$1"
 
-clientImage='buildpack-deps:stretch-curl'
+clientImage='buildpack-deps:buster-curl'
 
 # Create an instance of the container-under-test
 serverImage="$("$dir/../image-name.sh" librarytest/haproxy-basics "$image")"
@@ -35,7 +35,9 @@ _request() {
 		false
 	fi
 
-	docker run --rm --link "$cid":haproxy "$clientImage" \
+	docker run --rm \
+		--link "$cid":haproxy \
+		"$clientImage" \
 		curl -fsSL -X"$method" --connect-to '::haproxy:' "$@" "$proto://example.com/$url"
 }
 
diff --git a/test/tests/jetty-hello-web/run.sh b/test/tests/jetty-hello-web/run.sh
@@ -9,7 +9,7 @@ dir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
 image="$1"
 
 # Use a client image with curl for testing
-clientImage='buildpack-deps:stretch-curl'
+clientImage='buildpack-deps:buster-curl'
 
 # Create an instance of the container-under-test
 serverImage="$("$dir/../image-name.sh" librarytest/jetty-hello-web "$image")"
@@ -27,7 +27,9 @@ _request() {
 	local url="${1#/}"
 	shift
 
-	docker run --rm --link "$cid":jetty "$clientImage" \
+	docker run --rm \
+		--link "$cid":jetty \
+		"$clientImage" \
 		curl -fs -X"$method" "$@" "http://jetty:8080/$url"
 }
 
diff --git a/test/tests/logstash-basics/run.sh b/test/tests/logstash-basics/run.sh
@@ -8,8 +8,8 @@ dir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
 
 image="$1"
 
-# our image may not have "curl" (Alpine variants, for example)
-clientImage='buildpack-deps:stretch-curl'
+# Use a client image with curl for testing
+clientImage='buildpack-deps:buster-curl'
 
 # input via HTTP (default port 0.0.0.0:8080)
 # output via stdout, newline-delimited nothing-but-the-message
@@ -33,9 +33,11 @@ trap "docker rm -vf $cid > /dev/null" EXIT
 
 _request() {
 	# https://github.com/docker/docker/issues/14203#issuecomment-129865960 (DOCKER_FIX)
-	docker run --rm --link "$cid":logstash \
+	docker run --rm \
+		--link "$cid":logstash \
 		-e DOCKER_FIX='                                        ' \
-		"$clientImage" curl -fs "$@" "http://logstash:8080"
+		"$clientImage" \
+		curl -fs "$@" "http://logstash:8080"
 }
 
 _trimmed() {
diff --git a/test/tests/memcached-basics/run.sh b/test/tests/memcached-basics/run.sh
@@ -23,7 +23,8 @@ memcached-command() {
 	} \
 		| docker run --rm -i \
 			--link "$cname":memcached \
-			"$clientImage" nc memcached 11211 \
+			"$clientImage" \
+			nc memcached 11211 \
 		| tr -d '\r'
 }
 
diff --git a/test/tests/mongo-basics/run.sh b/test/tests/mongo-basics/run.sh
@@ -13,7 +13,7 @@ if docker info --format '{{ join .SecurityOptions "\n" }}' 2>/dev/null |tac|tac|
 	# make container with jq since it is not guaranteed on the host
 	jqImage='librarytest/mongo-basics-jq:alpine'
 	docker build -t "$jqImage" - > /dev/null <<-'EOF'
-		FROM alpine:3.9
+		FROM alpine:3.11
 
 		RUN apk add --no-cache jq
 
@@ -75,7 +75,7 @@ fi
 if [[ "$testName" == *tls* ]]; then
 	tlsImage="$("$testDir/../image-name.sh" librarytest/mongo-tls "$image")"
 	"$testDir/../docker-build.sh" "$testDir" "$tlsImage" <<-EOD
-		FROM alpine:3.10 AS certs
+		FROM alpine:3.11 AS certs
 		RUN apk add --no-cache openssl
 		RUN set -eux; \
 			mkdir /certs; \
@@ -129,7 +129,11 @@ cid="$(docker_run_seccomp "${mongodRunArgs[@]}" "$image" "${mongodCmdArgs[@]}")"
 trap "docker rm -vf $cid > /dev/null" EXIT
 
 mongo() {
-	docker_run_seccomp --rm -i --link "$cname":mongo "$image" mongo "${mongoArgs[@]}" "$@"
+	docker_run_seccomp --rm -i \
+		--link "$cname":mongo \
+		--entrypoint mongo \
+		"$image" \
+		"${mongoArgs[@]}" "$@"
 }
 
 mongo_eval() {
diff --git a/test/tests/nextcloud-apache-run/run.sh b/test/tests/nextcloud-apache-run/run.sh
@@ -3,10 +3,11 @@ set -eo pipefail
 
 dir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
 
-# since we have curl in the php image, we'll use that
-clientImage="$1"
 serverImage="$1"
 
+# Use a client image with curl for testing
+clientImage='buildpack-deps:buster-curl'
+
 # Create an instance of the container-under-test
 cid="$(docker run -d "$serverImage")"
 trap "docker rm -vf $cid > /dev/null" EXIT
@@ -18,7 +19,9 @@ _request() {
 	local url="${1#/}"
 	shift
 
-	docker run --rm --link "$cid":apache "$clientImage" \
+	docker run --rm \
+		--link "$cid":apache \
+		"$clientImage" \
 		curl -fsL -X"$method" "$@" "http://apache/$url"
 }
 
diff --git a/test/tests/nextcloud-fpm-run/run.sh b/test/tests/nextcloud-fpm-run/run.sh
@@ -29,7 +29,8 @@ fcgi-request() {
 		url="${url%%\?*}"
 	fi
 
-	docker run --rm -i --link "$cid":fpm \
+	docker run --rm -i \
+		--link "$cid":fpm \
 		-e REQUEST_METHOD="$method" \
 		-e SCRIPT_NAME="$url" \
 		-e SCRIPT_FILENAME=/var/www/html/"${url#/}" \
diff --git a/test/tests/nuxeo-conf/run.sh b/test/tests/nuxeo-conf/run.sh
@@ -6,6 +6,7 @@ image="$1"
 export NUXEO_DEV_MODE='true'
 export NUXEO_AUTOMATION_TRACE='true'
 
+# not using '--entrypoint nuxeoctl', since regular entrypoint does setup for nuxeoctl
 docker run --rm -i \
 	-e NUXEO_DEV_MODE \
 	-e NUXEO_AUTOMATION_TRACE \
diff --git a/test/tests/open-liberty-hello-world/run.sh b/test/tests/open-liberty-hello-world/run.sh
@@ -5,8 +5,8 @@ dir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
 
 image="$1"
 
-# Use the alpine image since it is small and has wget in it that we can use
-clientImage="alpine:3.9"
+# Use a client image with curl for testing
+clientImage='buildpack-deps:buster-curl'
 
 serverImage="$1"
 
@@ -18,8 +18,10 @@ _request() {
 	local url="${1#/}"
 	shift
 
-	docker run --rm --link "$cid":open-liberty "$clientImage" \
-		wget -q -O - "$@" "http://open-liberty:9080/$url"
+	docker run --rm \
+		--link "$cid":open-liberty \
+		"$clientImage" \
+		curl -fsSL "$@" "http://open-liberty:9080/$url"
 }
 
 # Make sure that Open Liberty is listening
diff --git a/test/tests/php-apache-hello-web/run.sh b/test/tests/php-apache-hello-web/run.sh
@@ -5,8 +5,8 @@ dir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
 
 image="$1"
 
-# since we have curl in the php image, we'll use that
-clientImage="$1"
+# Use a client image with curl for testing
+clientImage='buildpack-deps:buster-curl'
 
 serverImage="$("$dir/../image-name.sh" librarytest/php-apache-hello-web "$image")"
 "$dir/../docker-build.sh" "$dir" "$serverImage" <<EOD
@@ -25,7 +25,9 @@ _request() {
 	local url="${1#/}"
 	shift
 
-	docker run --rm --link "$cid":apache "$clientImage" \
+	docker run --rm \
+		--link "$cid":apache \
+		"$clientImage" \
 		curl -fs -X"$method" "$@" "http://apache/$url"
 }
 
diff --git a/test/tests/plone-addons/run.sh b/test/tests/plone-addons/run.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 set -eo pipefail
 
+# not using '--entrypoint', since regular entrypoint sets up config
 docker run -i --rm \
 	-e PLONE_DEVELOP=src/eea.facetednavigation \
 	-e PLONE_ADDONS=eea.facetednavigation \
diff --git a/test/tests/plone-cors/run.sh b/test/tests/plone-cors/run.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 set -eo pipefail
 
+# not using '--entrypoint', since regular entrypoint sets up config
 docker run -i --rm \
 	-e CORS_ALLOW_ORIGIN="http://example.com:4300,http://example.com:5300" \
 	-e CORS_ALLOW_METHODS="DELETE,PUT" \
diff --git a/test/tests/plone-versions/run.sh b/test/tests/plone-versions/run.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 set -eo pipefail
 
+# not using '--entrypoint', since regular entrypoint sets up config
 docker run -i --rm \
 	-e PLONE_DEVELOP=src/eea.facetednavigation \
 	-e PLONE_ADDONS=eea.facetednavigation \
diff --git a/test/tests/rabbitmq-basics/run.sh b/test/tests/rabbitmq-basics/run.sh
@@ -19,7 +19,10 @@ cid="$(docker run -d --name "$cname" "$serverImage")"
 trap "docker rm -vf $cid > /dev/null" EXIT
 
 client() {
-	docker run -i --rm --link "$cname":rabbitmq "$clientImage" "$@"
+	docker run -i --rm \
+		--link "$cname":rabbitmq \
+		"$clientImage" \
+		"$@"
 }
 
 . "$dir/../../retry.sh" 'client testconn.py'
diff --git a/test/tests/rabbitmq-tls/run.sh b/test/tests/rabbitmq-tls/run.sh
@@ -27,7 +27,7 @@ EOD
 
 testImage="$("$dir/../image-name.sh" librarytest/rabbitmq-tls-test "$1")"
 "$dir/../docker-build.sh" "$dir" "$testImage" <<'EOD'
-FROM alpine:3.10
+FROM alpine:3.11
 RUN apk add --no-cache bash coreutils drill openssl procps
 # https://github.com/drwetter/testssl.sh/releases
 ENV TESTSSL_VERSION 2.9.5-8
@@ -46,15 +46,25 @@ cid="$(docker run -d --name "$cname" --hostname "$cname" -e RABBITMQ_ERLANG_COOK
 trap "docker rm -vf $cid > /dev/null" EXIT
 
 testssl() {
-	docker run -i --rm --link "$cname" "$testImage" \
+	docker run -i --rm \
+		--link "$cname" \
+		"$testImage" \
 		testssl.sh --quiet --color 0 "$@" "$cname:5671"
 }
 rabbitmqctl() {
-	docker run -i --rm --link "$cname" -e RABBITMQ_ERLANG_COOKIE "$serverImage" \
+	# not using '--entrypoint', since regular entrypoint does needed env setup
+	docker run -i --rm \
+		--link "$cname" \
+		-e RABBITMQ_ERLANG_COOKIE \
+		"$serverImage" \
 		rabbitmqctl --node "rabbit@$cname" "$@"
 }
 rabbitmq-diagnostics() {
-	docker run -i --rm --link "$cname" -e RABBITMQ_ERLANG_COOKIE "$serverImage" \
+	# not using '--entrypoint', since regular entrypoint does needed env setup
+	docker run -i --rm \
+		--link "$cname" \
+		-e RABBITMQ_ERLANG_COOKIE \
+		"$serverImage" \
 		rabbitmq-diagnostics --node "rabbit@$cname" "$@"
 }
 
diff --git a/test/tests/rapidoid-hello-world/run.sh b/test/tests/rapidoid-hello-world/run.sh
@@ -9,7 +9,7 @@ dir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
 image="$1"
 
 # Use a client image with curl for testing
-clientImage='buildpack-deps:stretch-curl'
+clientImage='buildpack-deps:buster-curl'
 
 # Create an instance of the container-under-test
 serverImage="$("$dir/../image-name.sh" librarytest/rapidoid-hello-web "$image")"
@@ -31,7 +31,9 @@ _request() {
 	local url="${1#/}"
 	shift
 
-	docker run --rm --link "$cid":rapidoid "$clientImage" \
+	docker run --rm \
+		--link "$cid":rapidoid \
+		"$clientImage" \
 		curl -fs -X"$method" "$@" "http://rapidoid:8888/$url"
 }
 
diff --git a/test/tests/rapidoid-load-balancer/run.sh b/test/tests/rapidoid-load-balancer/run.sh
diff --git a/test/tests/redmine-basics/run.sh b/test/tests/redmine-basics/run.sh
diff --git a/test/tests/silverpeas-basics/run.sh b/test/tests/silverpeas-basics/run.sh
diff --git a/test/tests/tomcat-hello-world/run.sh b/test/tests/tomcat-hello-world/run.sh
diff --git a/test/tests/wordpress-apache-run/run.sh b/test/tests/wordpress-apache-run/run.sh

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,8 @@ memcached-command() {`
`23`	`23`	`} \`
`24`	`24`	`\| docker run --rm -i \`
`25`	`25`	`--link "$cname":memcached \`
`26`		`- "$clientImage" nc memcached 11211 \`
	`26`	`+ "$clientImage" \`
	`27`	`+ nc memcached 11211 \`
`27`	`28`	`\| tr -d '\r'`
`28`	`29`	`}`
`29`	`30`