From 728e6fade66729a18fb5b5a1294379943e4e44ce Mon Sep 17 00:00:00 2001 From: Christian Weichel Date: Mon, 2 May 2022 10:37:32 +0000 Subject: [PATCH 1/2] [ws-daemon] Add mapped gitpod user to passwd --- components/ws-daemon/leeway.Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/components/ws-daemon/leeway.Dockerfile b/components/ws-daemon/leeway.Dockerfile index 1b82e84f67e69f..d79dceb31f79c7 100644 --- a/components/ws-daemon/leeway.Dockerfile +++ b/components/ws-daemon/leeway.Dockerfile @@ -24,6 +24,8 @@ COPY --from=dl /dl/runc.amd64 /usr/bin/runc RUN addgroup -g 33333 gitpod \ && adduser -D -h /home/gitpod -s /bin/sh -u 33333 -G gitpod gitpod \ && echo "gitpod:gitpod" | chpasswd +# Add gitpodmp user for operations in the mapped UID/GID space +RUN echo "gitpodmp:x:133332:133332::/home/gitpod:/bin/bash" >> /etc/passwd COPY components-ws-daemon--app/ws-daemon /app/ws-daemond COPY components-ws-daemon--content-initializer/ws-daemon /app/content-initializer From e551662865d2372b5badb83d6084d518d33eaadf Mon Sep 17 00:00:00 2001 From: Prince Rachit Sinha Date: Tue, 3 May 2022 08:34:00 +0000 Subject: [PATCH 2/2] Add github.com to known hosts --- components/ws-daemon/leeway.Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/components/ws-daemon/leeway.Dockerfile b/components/ws-daemon/leeway.Dockerfile index d79dceb31f79c7..7d3ce4ebc6f3e2 100644 --- a/components/ws-daemon/leeway.Dockerfile +++ b/components/ws-daemon/leeway.Dockerfile @@ -26,6 +26,8 @@ RUN addgroup -g 33333 gitpod \ && echo "gitpod:gitpod" | chpasswd # Add gitpodmp user for operations in the mapped UID/GID space RUN echo "gitpodmp:x:133332:133332::/home/gitpod:/bin/bash" >> /etc/passwd +# Add missing known_hosts entry +RUN mkdir /home/gitpod/.ssh && echo $(ssh-keyscan -t rsa github.com) > /home/gitpod/.ssh/known_hosts COPY components-ws-daemon--app/ws-daemon /app/ws-daemond COPY components-ws-daemon--content-initializer/ws-daemon /app/content-initializer