diff --git a/Dockerfile b/Dockerfile
index dae45406a20f241d5356fa4e5dc014a2dd31c5e8..1ebf0e3d3d4ef56a4399e82d09f8f9307290442c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,4 +15,8 @@ RUN yarn global add --ignore-optional --silent @antora/cli@latest @antora/site-g
 
 WORKDIR /antora
 
-ENTRYPOINT [ "antora" ]
+COPY docker-entrypoint.sh /usr/local/bin/
+
+ENTRYPOINT ["docker-entrypoint.sh"]
+
+CMD ["antora"]
diff --git a/README.adoc b/README.adoc
index de2b41a893b5902501a7c4bffdb9349d31a91ea0..35e783bf010ad4400bc8cb627aa92d535719ccee 100644
--- a/README.adoc
+++ b/README.adoc
@@ -1,4 +1,4 @@
-= Docker Image for Antora 
+= Docker Image for Antora
 :uri-antora: https://antora.org
 :uri-asciidoctor: https://asciidoctor.org
 :uri-license: https://www.mozilla.org/en-US/MPL/2.0/
@@ -32,7 +32,8 @@ If you want to help improve this image, you should learn how to <<build-image,bu
 
 This image is intended to be used as a command in a box.
 You can use this image as a replacement for the `antora` command to execute a playbook.
-The benefit is that you don't actually to install Antora itself.
+(The arguments that follow the name of the image are assumed to either be arguments to the `antora` command or a local command).
+The benefit is that you don't have to install Antora itself.
 
 To demonstrate how to use this image, we'll be using the https://gitlab.com/antora/demo/demo-site[Antora demo site].
 Start by cloning the playbook repository for the demo site, then switch to the newly created folder:
@@ -65,41 +66,34 @@ You can fix this problem by setting the cache dir explicitly when running Antora
    antora/antora --stacktrace --cache-dir=./.cache site.yml
 ====
 
-If you want to shell into the container, set the `--entrypoint` option as follows:
+If you want to shell into the container, use the following command:
 
- $ docker run --entrypoint ash --privileged -v `pwd`:/antora --rm -it antora/antora
+ $ docker run --privileged -v `pwd`:/antora --rm -it antora/antora sh
 
-This command allows you to use the `antora` command inside the running container (but still generate files to the local filesystem).
+This command allows you to run the `antora` command from a prompt inside the running container (but will generate files to the local filesystem).
+
+In fact, if the first argument following the image name is a local command, the container will execute that command instead of `antora`.
 
 [#gitlab-ci-image]
 === Use the image in GitLab CI
 
-If you attempt to use this image as the base image in GitLab CI, you'll likely encounter the following error message (just after the `Skipping Git submodules setup` line in the log):
-
- error: unknown option `-c'
-
-This happens because this image defines the `antora` command as the default entrypoint rather than a shell command.
-In order to use this image as the base image in GitLab CI, you'll need to override the entrypoint to be a shell command as GitLab CI expects.
-
-To override the entrypoint in a way that's compatible with GitLab CI, define the image in `.gitlab-ci.yml` as follows:
+Thanks to the custom entrypoint script ([.path]_docker-entrypoint.sh_), this image will work on GitLab CI without having to specify the entrypoint.
+Simply reference the image name at the top of the [.path]_.gitlab-ci.yml_ file, as shown here:
 
 [source,yaml]
 ----
-image: 
+image:
   name: antora/antora
-  entrypoint: [/bin/sh, -c]
 ----
 
-Now you'll be able to invoke the `antora` command from a script clause in `.gitlab-ci.yml` as follows:
+By using this image, you can invoke the `antora` command from a script clause in [.path]_.gitlab-ci.yml_ as follows:
 
-[source,yaml] 
+[source,yaml]
 ----
   script:
   - antora site.yml
 ----
 
-This is similar to how we shelled into the container by passing the `--entrypoint` option in the previous section.
-
 [#extend-image]
 === Use as a Base Image
 
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
new file mode 100755
index 0000000000000000000000000000000000000000..1f46341a56228d9b2864a796bac577065f914a68
--- /dev/null
+++ b/docker-entrypoint.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+# abort script if a command fails
+set -e
+
+# prepend antora if command is not detected
+if [ $# -eq 0 ] || [ "${1:0:1}" == '-' ] || [ -z `command -v "$1" || echo -n` ]; then
+  set -- antora "$@"
+fi
+
+exec "$@"