From 35a6ca7054d66bebd169c7138b20f5fcf7f3a1f1 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Mon, 11 Mar 2019 14:24:28 +0000 Subject: [PATCH] e2e: avoid `usermod -p` by using `useradd`'s `--password` option Signed-off-by: Ian Campbell (cherry picked from commit 0b0c57871ad158f032489cdfc62c676025aec42b) Signed-off-by: Sebastiaan van Stijn Upstream-commit: 78d52ec5d4db79ad7ef670080e28c88b910ba31b Component: cli --- components/cli/e2e/testdata/Dockerfile.connhelper-ssh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/components/cli/e2e/testdata/Dockerfile.connhelper-ssh b/components/cli/e2e/testdata/Dockerfile.connhelper-ssh index a97d83104e..64306b518c 100644 --- a/components/cli/e2e/testdata/Dockerfile.connhelper-ssh +++ b/components/cli/e2e/testdata/Dockerfile.connhelper-ssh @@ -1,9 +1,8 @@ FROM docker:test-dind RUN apk --no-cache add shadow openssh-server && \ groupadd -f docker && \ - useradd --create-home --shell /bin/sh penguin && \ + useradd --create-home --shell /bin/sh --password $(head -c32 /dev/urandom | base64) penguin && \ usermod -aG docker penguin && \ - usermod -p $(head -c32 /dev/urandom | base64) penguin && \ ssh-keygen -A # workaround: ssh session excludes /usr/local/bin from $PATH RUN ln -s /usr/local/bin/docker /usr/bin/docker