From bdf5b9d720c272a05a84b6357dc278d35fc9d453 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Wed, 8 Feb 2017 13:20:03 -0800 Subject: [PATCH] Add initial entrypoint script for handling direct "bash" flags ("docker run bash -c '...'") --- .travis.yml | 2 ++ 3.0/Dockerfile | 2 ++ 3.0/docker-entrypoint.sh | 11 +++++++++++ 3.1/Dockerfile | 2 ++ 3.1/docker-entrypoint.sh | 11 +++++++++++ 3.2/Dockerfile | 2 ++ 3.2/docker-entrypoint.sh | 11 +++++++++++ 4.0/Dockerfile | 2 ++ 4.0/docker-entrypoint.sh | 11 +++++++++++ 4.1/Dockerfile | 2 ++ 4.1/docker-entrypoint.sh | 11 +++++++++++ 4.2/Dockerfile | 2 ++ 4.2/docker-entrypoint.sh | 11 +++++++++++ 4.3/Dockerfile | 2 ++ 4.3/docker-entrypoint.sh | 11 +++++++++++ 4.4/Dockerfile | 2 ++ 4.4/docker-entrypoint.sh | 11 +++++++++++ docker-entrypoint.sh | 11 +++++++++++ update.sh | 1 + 19 files changed, 118 insertions(+) create mode 100755 3.0/docker-entrypoint.sh create mode 100755 3.1/docker-entrypoint.sh create mode 100755 3.2/docker-entrypoint.sh create mode 100755 4.0/docker-entrypoint.sh create mode 100755 4.1/docker-entrypoint.sh create mode 100755 4.2/docker-entrypoint.sh create mode 100755 4.3/docker-entrypoint.sh create mode 100755 4.4/docker-entrypoint.sh create mode 100755 docker-entrypoint.sh diff --git a/.travis.yml b/.travis.yml index daa5f12..321af16 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,6 +21,8 @@ before_script: script: - docker build -t "$image" . + - docker run -it --rm "$image" --version + - docker run -it --rm "$image" echo hi - ~/official-images/test/run.sh "$image" after_script: diff --git a/3.0/Dockerfile b/3.0/Dockerfile index 0a788fe..451c912 100644 --- a/3.0/Dockerfile +++ b/3.0/Dockerfile @@ -115,4 +115,6 @@ RUN set -ex; \ # for some reason, 3.0.xx manifests as 3.00.xx (hence the extra "0" added in the following check) [ "$(bash -c 'echo "${BASH_VERSION%%[^0-9.]*}"')" = "${_BASH_VERSION}0.$_BASH_LATEST_PATCH" ]; +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] CMD ["bash"] diff --git a/3.0/docker-entrypoint.sh b/3.0/docker-entrypoint.sh new file mode 100755 index 0000000..d64f382 --- /dev/null +++ b/3.0/docker-entrypoint.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash +set -Eeuo pipefail + +# first arg is `-f` or `--some-option` +# or there are no args +if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then + # docker run bash -c 'echo hi' + exec bash "$@" +fi + +exec "$@" diff --git a/3.1/Dockerfile b/3.1/Dockerfile index 93977dc..6e96155 100644 --- a/3.1/Dockerfile +++ b/3.1/Dockerfile @@ -114,4 +114,6 @@ RUN set -ex; \ bash --version; \ [ "$(bash -c 'echo "${BASH_VERSION%%[^0-9.]*}"')" = "$_BASH_VERSION.$_BASH_LATEST_PATCH" ]; +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] CMD ["bash"] diff --git a/3.1/docker-entrypoint.sh b/3.1/docker-entrypoint.sh new file mode 100755 index 0000000..d64f382 --- /dev/null +++ b/3.1/docker-entrypoint.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash +set -Eeuo pipefail + +# first arg is `-f` or `--some-option` +# or there are no args +if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then + # docker run bash -c 'echo hi' + exec bash "$@" +fi + +exec "$@" diff --git a/3.2/Dockerfile b/3.2/Dockerfile index 8692900..94da9a6 100644 --- a/3.2/Dockerfile +++ b/3.2/Dockerfile @@ -114,4 +114,6 @@ RUN set -ex; \ bash --version; \ [ "$(bash -c 'echo "${BASH_VERSION%%[^0-9.]*}"')" = "$_BASH_VERSION.$_BASH_LATEST_PATCH" ]; +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] CMD ["bash"] diff --git a/3.2/docker-entrypoint.sh b/3.2/docker-entrypoint.sh new file mode 100755 index 0000000..d64f382 --- /dev/null +++ b/3.2/docker-entrypoint.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash +set -Eeuo pipefail + +# first arg is `-f` or `--some-option` +# or there are no args +if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then + # docker run bash -c 'echo hi' + exec bash "$@" +fi + +exec "$@" diff --git a/4.0/Dockerfile b/4.0/Dockerfile index a28843e..04b2dc1 100644 --- a/4.0/Dockerfile +++ b/4.0/Dockerfile @@ -117,4 +117,6 @@ RUN set -ex; \ bash --version; \ [ "$(bash -c 'echo "${BASH_VERSION%%[^0-9.]*}"')" = "$_BASH_VERSION.$_BASH_LATEST_PATCH" ]; +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] CMD ["bash"] diff --git a/4.0/docker-entrypoint.sh b/4.0/docker-entrypoint.sh new file mode 100755 index 0000000..d64f382 --- /dev/null +++ b/4.0/docker-entrypoint.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash +set -Eeuo pipefail + +# first arg is `-f` or `--some-option` +# or there are no args +if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then + # docker run bash -c 'echo hi' + exec bash "$@" +fi + +exec "$@" diff --git a/4.1/Dockerfile b/4.1/Dockerfile index 7509fb2..450f039 100644 --- a/4.1/Dockerfile +++ b/4.1/Dockerfile @@ -114,4 +114,6 @@ RUN set -ex; \ bash --version; \ [ "$(bash -c 'echo "${BASH_VERSION%%[^0-9.]*}"')" = "$_BASH_VERSION.$_BASH_LATEST_PATCH" ]; +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] CMD ["bash"] diff --git a/4.1/docker-entrypoint.sh b/4.1/docker-entrypoint.sh new file mode 100755 index 0000000..d64f382 --- /dev/null +++ b/4.1/docker-entrypoint.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash +set -Eeuo pipefail + +# first arg is `-f` or `--some-option` +# or there are no args +if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then + # docker run bash -c 'echo hi' + exec bash "$@" +fi + +exec "$@" diff --git a/4.2/Dockerfile b/4.2/Dockerfile index b5699b2..6a6ed50 100644 --- a/4.2/Dockerfile +++ b/4.2/Dockerfile @@ -114,4 +114,6 @@ RUN set -ex; \ bash --version; \ [ "$(bash -c 'echo "${BASH_VERSION%%[^0-9.]*}"')" = "$_BASH_VERSION.$_BASH_LATEST_PATCH" ]; +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] CMD ["bash"] diff --git a/4.2/docker-entrypoint.sh b/4.2/docker-entrypoint.sh new file mode 100755 index 0000000..d64f382 --- /dev/null +++ b/4.2/docker-entrypoint.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash +set -Eeuo pipefail + +# first arg is `-f` or `--some-option` +# or there are no args +if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then + # docker run bash -c 'echo hi' + exec bash "$@" +fi + +exec "$@" diff --git a/4.3/Dockerfile b/4.3/Dockerfile index bad762d..d9796d2 100644 --- a/4.3/Dockerfile +++ b/4.3/Dockerfile @@ -115,4 +115,6 @@ RUN set -ex; \ bash --version; \ [ "$(bash -c 'echo "${BASH_VERSION%%[^0-9.]*}"')" = "$_BASH_VERSION.$_BASH_LATEST_PATCH" ]; +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] CMD ["bash"] diff --git a/4.3/docker-entrypoint.sh b/4.3/docker-entrypoint.sh new file mode 100755 index 0000000..d64f382 --- /dev/null +++ b/4.3/docker-entrypoint.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash +set -Eeuo pipefail + +# first arg is `-f` or `--some-option` +# or there are no args +if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then + # docker run bash -c 'echo hi' + exec bash "$@" +fi + +exec "$@" diff --git a/4.4/Dockerfile b/4.4/Dockerfile index 146341a..6174f3d 100644 --- a/4.4/Dockerfile +++ b/4.4/Dockerfile @@ -115,4 +115,6 @@ RUN set -ex; \ bash --version; \ [ "$(bash -c 'echo "${BASH_VERSION%%[^0-9.]*}"')" = "$_BASH_VERSION.$_BASH_LATEST_PATCH" ]; +COPY docker-entrypoint.sh /usr/local/bin/ +ENTRYPOINT ["docker-entrypoint.sh"] CMD ["bash"] diff --git a/4.4/docker-entrypoint.sh b/4.4/docker-entrypoint.sh new file mode 100755 index 0000000..d64f382 --- /dev/null +++ b/4.4/docker-entrypoint.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash +set -Eeuo pipefail + +# first arg is `-f` or `--some-option` +# or there are no args +if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then + # docker run bash -c 'echo hi' + exec bash "$@" +fi + +exec "$@" diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh new file mode 100755 index 0000000..d64f382 --- /dev/null +++ b/docker-entrypoint.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash +set -Eeuo pipefail + +# first arg is `-f` or `--some-option` +# or there are no args +if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then + # docker run bash -c 'echo hi' + exec bash "$@" +fi + +exec "$@" diff --git a/update.sh b/update.sh index edb8ee0..22e46c7 100755 --- a/update.sh +++ b/update.sh @@ -59,6 +59,7 @@ for version in "${versions[@]}"; do s/^(ENV _BASH_PATCH_LEVEL) .*/\1 '"$patchLevel"'/; s/^(ENV _BASH_LATEST_PATCH) .*/\1 '"$latestPatch"'/ ' "$version/Dockerfile" + cp -a docker-entrypoint.sh "$version/" ) travisEnv='\n - VERSION='"$version$travisEnv" done