From eb68b5730f9770edc1d8f61766933bcbdd012613 Mon Sep 17 00:00:00 2001 From: Denis Melnik Date: Tue, 16 Feb 2021 17:04:05 +0200 Subject: [PATCH 1/4] CR-2817 Fix submodules fetching --- .ssh/config | 5 ++++- service.yaml | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.ssh/config b/.ssh/config index 081e280..5afcb90 100644 --- a/.ssh/config +++ b/.ssh/config @@ -1 +1,4 @@ -IdentityFile ~/.ssh/codefresh \ No newline at end of file +IdentityFile ~/.ssh/codefresh + +Host github.com + StrictHostKeyChecking no \ No newline at end of file diff --git a/service.yaml b/service.yaml index 411d6f4..fd14452 100644 --- a/service.yaml +++ b/service.yaml @@ -1 +1 @@ -version: 10.0.3 +version: 10.0.4 From 70859ef59a7a06fa4340355e55b1a5bd71e28301 Mon Sep 17 00:00:00 2001 From: Denis Melnik Date: Fri, 19 Feb 2021 13:39:17 +0200 Subject: [PATCH 2/4] add git providers fingerprints during the build of the image --- .ssh/config | 3 --- Dockerfile | 6 +++++- Dockerfile.aarch64 | 8 ++++++-- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.ssh/config b/.ssh/config index 5afcb90..e836f98 100644 --- a/.ssh/config +++ b/.ssh/config @@ -1,4 +1 @@ IdentityFile ~/.ssh/codefresh - -Host github.com - StrictHostKeyChecking no \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 5390fb3..db560ac 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,9 +10,13 @@ RUN apk add --no-cache --virtual deps openssl && \ git lfs install && \ apk del deps -#add ssh record on which ssh key to use +# add ssh record on which ssh key to use COPY ./.ssh/ /root/.ssh/ +# add fingerprint for major git providers +RUN ssh-keyscan github.com >> /root/.ssh/known_hosts +RUN ssh-keyscan bitbucket.org >> /root/.ssh/known_hosts + COPY ./start.sh /run/start.sh RUN chmod +x /run/start.sh diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index c019fe4..f780231 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,5 +1,5 @@ FROM arm64v8/alpine:3.7 -RUN apk add --no-cache git bash openssh +RUN apk add --no-cache git bash # install git-lfs RUN apk add --no-cache --virtual deps openssl && \ @@ -9,9 +9,13 @@ RUN apk add --no-cache --virtual deps openssl && \ git lfs install && \ apk del deps -#add ssh record on which ssh key to use +# add ssh record on which ssh key to use COPY ./.ssh/ /root/.ssh/ +# add fingerprint for major git providers +RUN ssh-keyscan github.com > /root/.ssh/known_hosts +RUN ssh-keyscan bitbucket.org > /root/.ssh/known_hosts + COPY ./start.sh /run/start.sh RUN chmod +x /run/start.sh From d2420cc41c3b8a3950624152c61b0108f458f93b Mon Sep 17 00:00:00 2001 From: Denis Melnik Date: Fri, 19 Feb 2021 13:45:46 +0200 Subject: [PATCH 3/4] rebuild --- Dockerfile.aarch64 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index f780231..151c882 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -13,8 +13,8 @@ RUN apk add --no-cache --virtual deps openssl && \ COPY ./.ssh/ /root/.ssh/ # add fingerprint for major git providers -RUN ssh-keyscan github.com > /root/.ssh/known_hosts -RUN ssh-keyscan bitbucket.org > /root/.ssh/known_hosts +RUN ssh-keyscan github.com >> /root/.ssh/known_hosts +RUN ssh-keyscan bitbucket.org >> /root/.ssh/known_hosts COPY ./start.sh /run/start.sh RUN chmod +x /run/start.sh From b3d6e1d23c6111345d155b795f21eed3faa88ce2 Mon Sep 17 00:00:00 2001 From: Denis Melnik Date: Fri, 19 Feb 2021 14:03:11 +0200 Subject: [PATCH 4/4] return axidently removed openssh --- Dockerfile.aarch64 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 151c882..c65044e 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,5 +1,5 @@ FROM arm64v8/alpine:3.7 -RUN apk add --no-cache git bash +RUN apk add --no-cache git bash openssh # install git-lfs RUN apk add --no-cache --virtual deps openssl && \