From 50454937890778b2ffe146195c2ccebb505791f6 Mon Sep 17 00:00:00 2001 From: Timofey Kirillov Date: Tue, 29 Nov 2022 12:50:24 +0300 Subject: [PATCH] fix: fix ssh not available in registry.werf.io/werf images Fix problem with git submodules fetching over ssh when running werf in the registry.werf.io/werf/werf image. Signed-off-by: Timofey Kirillov --- scripts/werf-in-image/alpine.Dockerfile | 2 +- scripts/werf-in-image/centos.Dockerfile | 2 +- scripts/werf-in-image/fedora.Dockerfile | 2 +- scripts/werf-in-image/ubuntu.Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/werf-in-image/alpine.Dockerfile b/scripts/werf-in-image/alpine.Dockerfile index 6680e20a4c..42ce293da5 100644 --- a/scripts/werf-in-image/alpine.Dockerfile +++ b/scripts/werf-in-image/alpine.Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.15 -RUN apk add --no-cache fuse-overlayfs git shadow-uidmap libcap +RUN apk add --no-cache fuse-overlayfs git shadow-uidmap libcap openssh-client # Fix messed up setuid/setgid capabilities. RUN setcap cap_setuid+ep /usr/bin/newuidmap && \ diff --git a/scripts/werf-in-image/centos.Dockerfile b/scripts/werf-in-image/centos.Dockerfile index 2bd16308e4..5fbe89442f 100644 --- a/scripts/werf-in-image/centos.Dockerfile +++ b/scripts/werf-in-image/centos.Dockerfile @@ -1,6 +1,6 @@ FROM quay.io/centos/centos:stream9 -RUN dnf -y install fuse-overlayfs git && \ +RUN dnf -y install fuse-overlayfs git openssh-clients && \ dnf clean all && rm -rf /var/cache /var/log/dnf* /var/log/yum.* # Fix messed up setuid/setgid capabilities. diff --git a/scripts/werf-in-image/fedora.Dockerfile b/scripts/werf-in-image/fedora.Dockerfile index 523297dc78..fb2c13d8b6 100644 --- a/scripts/werf-in-image/fedora.Dockerfile +++ b/scripts/werf-in-image/fedora.Dockerfile @@ -1,6 +1,6 @@ FROM fedora:35 -RUN dnf -y install fuse-overlayfs git && \ +RUN dnf -y install fuse-overlayfs git openssh-clients && \ dnf clean all && rm -rf /var/cache /var/log/dnf* /var/log/yum.* # Fix messed up setuid/setgid capabilities. diff --git a/scripts/werf-in-image/ubuntu.Dockerfile b/scripts/werf-in-image/ubuntu.Dockerfile index 11937032a5..0ba6a27963 100644 --- a/scripts/werf-in-image/ubuntu.Dockerfile +++ b/scripts/werf-in-image/ubuntu.Dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:20.04 ENV DEBIAN_FRONTEND="noninteractive" -RUN apt-get -y update && apt-get -y install fuse-overlayfs git uidmap libcap2-bin && \ +RUN apt-get -y update && apt-get -y install fuse-overlayfs git uidmap libcap2-bin openssh-client && \ rm -rf /var/cache/apt/* /var/lib/apt/lists/* /var/log/* # Fix messed up setuid/setgid capabilities.