Merge branch '2.2.x'

Closes gh-19031

spring-boot-project/spring-boot-docs/src/main/asciidoc/deployment.adoc

@@ -41,8 +41,8 @@ For example, using a `Dockerfile` you could express it in this form:
 ----
 	FROM openjdk:8-jdk-alpine AS builder
 	WORKDIR target/dependency
-	ARG appjar
+	ARG APPJAR=target/*.jar
-	COPY ${appjar} app.jar
+	COPY ${APPJAR} app.jar
 	RUN jar -xf ./app.jar
 
 	FROM openjdk:8-jre-alpine
@@ -54,11 +54,11 @@ For example, using a `Dockerfile` you could express it in this form:
 	ENTRYPOINT ["java","-cp","app:app/lib/*","com.example.MyApplication"]
 ----
 
-Assuming the above `Dockerfile` is the current directory, your docker image can be built specifying the path to your application jar, as show in the following example:
+Assuming the above `Dockerfile` is the current directory, your docker image can be built with `docker build .`, or optionally specifying the path to your application jar, as show in the following example:
 
 [indent=0]
 ----
-	docker build --build-arg appjar=path/to/myapp.jar .
+	docker build --build-arg APPJAR=path/to/myapp.jar .
 ----