From 000f157285eeaca45fd749f33f8d9c1862eec454 Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Fri, 27 Mar 2020 14:38:49 -0700 Subject: [PATCH 1/7] checkpoint - working --- .../preview/ubuntu18.04/docker/pwsh-entrypoint.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100755 release/preview/ubuntu18.04/docker/pwsh-entrypoint.sh diff --git a/release/preview/ubuntu18.04/docker/pwsh-entrypoint.sh b/release/preview/ubuntu18.04/docker/pwsh-entrypoint.sh new file mode 100755 index 000000000..f88712ed6 --- /dev/null +++ b/release/preview/ubuntu18.04/docker/pwsh-entrypoint.sh @@ -0,0 +1,12 @@ +#!/bin/sh +set -e + +# first arg is `pwsh` or similar +if [ $1 = 'pwsh' ] || [ $1 = 'pwsh-preview' ]; then + # using this as a no-op + set -e +else + set -- pwsh -nologo -l -c "$@" +fi + +exec "$@" \ No newline at end of file From f9777cf02e00b9c60cb5e01f17e69314697e0312 Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Fri, 27 Mar 2020 16:21:38 -0700 Subject: [PATCH 2/7] got the entrypoint working --- release/preview/ubuntu18.04/docker/pwsh-entrypoint.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/release/preview/ubuntu18.04/docker/pwsh-entrypoint.sh b/release/preview/ubuntu18.04/docker/pwsh-entrypoint.sh index f88712ed6..334588fc4 100755 --- a/release/preview/ubuntu18.04/docker/pwsh-entrypoint.sh +++ b/release/preview/ubuntu18.04/docker/pwsh-entrypoint.sh @@ -2,10 +2,7 @@ set -e # first arg is `pwsh` or similar -if [ $1 = 'pwsh' ] || [ $1 = 'pwsh-preview' ]; then - # using this as a no-op - set -e -else +if ! { [ $1 = 'pwsh' ] || [ $1 = 'pwsh-preview' ]; }; then set -- pwsh -nologo -l -c "$@" fi From 2cbe4e916ee55a927edd214570aedb672b774d93 Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Fri, 27 Mar 2020 16:24:57 -0700 Subject: [PATCH 3/7] use entry point --- release/preview/ubuntu18.04/docker/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/release/preview/ubuntu18.04/docker/Dockerfile b/release/preview/ubuntu18.04/docker/Dockerfile index 18bc2e89f..d064e9c9b 100644 --- a/release/preview/ubuntu18.04/docker/Dockerfile +++ b/release/preview/ubuntu18.04/docker/Dockerfile @@ -74,3 +74,4 @@ LABEL maintainer="PowerShell Team " \ # Use PowerShell as the default shell # Use array to avoid Docker prepending /bin/sh -c CMD [ "pwsh-preview" ] + From 38084700b51897286cd7966655e26d4ccf4d4747 Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Mon, 30 Mar 2020 16:12:11 -0700 Subject: [PATCH 4/7] update entrypoint --- release/preview/ubuntu18.04/docker/Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/release/preview/ubuntu18.04/docker/Dockerfile b/release/preview/ubuntu18.04/docker/Dockerfile index d064e9c9b..97ed3ea4c 100644 --- a/release/preview/ubuntu18.04/docker/Dockerfile +++ b/release/preview/ubuntu18.04/docker/Dockerfile @@ -71,7 +71,10 @@ LABEL maintainer="PowerShell Team " \ org.label-schema.docker.cmd.test="docker run ${IMAGE_NAME} pwsh -c Invoke-Pester" \ org.label-schema.docker.cmd.help="docker run ${IMAGE_NAME} pwsh -c Get-Help" +ADD ./pwsh-entrypoint.sh /usr/local/bin/pwsh-entrypoint.sh + +ENTRYPOINT [ "pwsh-entrypoint.sh" ] + # Use PowerShell as the default shell -# Use array to avoid Docker prepending /bin/sh -c CMD [ "pwsh-preview" ] From 78a35d5dec323773a454407ef04224fbc35893ff Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Mon, 30 Mar 2020 16:14:09 -0700 Subject: [PATCH 5/7] remove extra line --- release/preview/ubuntu18.04/docker/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/release/preview/ubuntu18.04/docker/Dockerfile b/release/preview/ubuntu18.04/docker/Dockerfile index 97ed3ea4c..1d1554c9a 100644 --- a/release/preview/ubuntu18.04/docker/Dockerfile +++ b/release/preview/ubuntu18.04/docker/Dockerfile @@ -77,4 +77,3 @@ ENTRYPOINT [ "pwsh-entrypoint.sh" ] # Use PowerShell as the default shell CMD [ "pwsh-preview" ] - From 6c882e596038439bd209e68cb2f2869f4ee268ca Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Mon, 30 Mar 2020 16:14:56 -0700 Subject: [PATCH 6/7] make posix compliante --- release/preview/ubuntu18.04/docker/pwsh-entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/preview/ubuntu18.04/docker/pwsh-entrypoint.sh b/release/preview/ubuntu18.04/docker/pwsh-entrypoint.sh index 334588fc4..a76076985 100755 --- a/release/preview/ubuntu18.04/docker/pwsh-entrypoint.sh +++ b/release/preview/ubuntu18.04/docker/pwsh-entrypoint.sh @@ -6,4 +6,4 @@ if ! { [ $1 = 'pwsh' ] || [ $1 = 'pwsh-preview' ]; }; then set -- pwsh -nologo -l -c "$@" fi -exec "$@" \ No newline at end of file +exec "$@" From a73686db3f68f89ecbf2c2fbf8311c5fc93e6803 Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Wed, 15 Apr 2020 13:42:36 -0700 Subject: [PATCH 7/7] fix entrypoint --- release/preview/ubuntu18.04/docker/pwsh-entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/preview/ubuntu18.04/docker/pwsh-entrypoint.sh b/release/preview/ubuntu18.04/docker/pwsh-entrypoint.sh index a76076985..6f7ba6515 100755 --- a/release/preview/ubuntu18.04/docker/pwsh-entrypoint.sh +++ b/release/preview/ubuntu18.04/docker/pwsh-entrypoint.sh @@ -2,7 +2,7 @@ set -e # first arg is `pwsh` or similar -if ! { [ $1 = 'pwsh' ] || [ $1 = 'pwsh-preview' ]; }; then +if ! { [ "$1" = 'pwsh' ] || [ "$1" = 'pwsh-preview' ] || [ "$1" = '/bin/bash' ] || [ "$1" = '/bin/sh' ] || [ "$1" = 'bash' ] || [ "$1" = 'sh' ]; }; then set -- pwsh -nologo -l -c "$@" fi