Skip to content

Commit b928dba

Browse files
Merge pull request #10 from codefresh-io/SAAS-6392
SAAS-6392 Add PRIVATE_KEY support
2 parents 81f62e1 + 810783a commit b928dba

File tree

6 files changed

+24
-13
lines changed

6 files changed

+24
-13
lines changed

.ssh/config

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1 @@
1-
IdentityFile ~/.ssh/codefresh
2-
3-
Host github.com
4-
StrictHostKeyChecking no
1+
IdentityFile ~/.ssh/codefresh

.ssh/known_hosts

-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +0,0 @@
1-
github.com ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==
2-
bitbucket.com ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAubiN81eDcafrgMeLzaFPsw2kNvEcqTKl/VqLat/MaB33pZy0y3rJZtnqwR2qOOvbwKZYKiEO1O6VqNEBxKvJJelCq0dTXWT5pbO2gDXC6h6QDXCaHo6pOHGPUy+YBaGQRGuSusMEASYiWunYN0vCAI8QaXnWMXNMdFP3jHAJH0eDsoiGnLPBlBp4TNm6rYI74nMzgz3B9IikW4WVK+dc8KZJZWYjAuORU3jc1c/NPskD2ASinf8v3xnfXeukU0sJ5N6m5E8VLjObPEO+mN2t/FZTMZLiFqPWc/ALSqnMnnhwrNi2rbfg/rd/IpL8Le3pSBne8+seeFVBoGqzHM9yXw==
3-
bitbucket.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAubiN81eDcafrgMeLzaFPsw2kNvEcqTKl/VqLat/MaB33pZy0y3rJZtnqwR2qOOvbwKZYKiEO1O6VqNEBxKvJJelCq0dTXWT5pbO2gDXC6h6QDXCaHo6pOHGPUy+YBaGQRGuSusMEASYiWunYN0vCAI8QaXnWMXNMdFP3jHAJH0eDsoiGnLPBlBp4TNm6rYI74nMzgz3B9IikW4WVK+dc8KZJZWYjAuORU3jc1c/NPskD2ASinf8v3xnfXeukU0sJ5N6m5E8VLjObPEO+mN2t/FZTMZLiFqPWc/ALSqnMnnhwrNi2rbfg/rd/IpL8Le3pSBne8+seeFVBoGqzHM9yXw==

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM alpine:3.10.3
22

3-
RUN apk add --no-cache git=2.22.2-r0 bash
3+
RUN apk add --no-cache git~=2.22 bash openssh
44

55
# install git-lfs
66
RUN apk add --no-cache --virtual deps openssl && \

Dockerfile.aarch64

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
FROM arm64v8/alpine:3.7
2-
RUN apk add --no-cache git bash
2+
RUN apk add --no-cache git bash openssh
33

44
# install git-lfs
55
RUN apk add --no-cache --virtual deps openssl && \

service.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
version: 9.2.0
1+
version: 10.0.0

start.sh

+20-3
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,28 @@ git_retry () {
3434
trap exit_trap EXIT
3535
set -e
3636

37+
3738
[ -z "$REVISION" ] && (echo "missing REVISION var" | tee /dev/stderr) && exit 1
3839

39-
echo "$PRIVATE_KEY" > /root/.ssh/codefresh
40-
chmod 700 ~/.ssh/
41-
chmod 600 ~/.ssh/*
40+
41+
if [ "$USE_SSH" = "true" ]; then
42+
echo "Cloning using SSH: $REPO"
43+
44+
[ -z "$PRIVATE_KEY" ] && (echo "missing PRIVATE_KEY var" | tee /dev/stderr) && exit 1
45+
46+
echo "$PRIVATE_KEY" > /root/.ssh/codefresh
47+
chmod 700 ~/.ssh/
48+
chmod 600 ~/.ssh/*
49+
50+
# ssh://[email protected]:username/repo.git
51+
# match "github.com" from ssh uri
52+
REPO=${REPO#"ssh://"}
53+
SSH_HOST=$(echo "$REPO" | cut -d ":" -f 1 | cut -d "@" -f 2)
54+
55+
echo "Adding "$SSH_HOST" to known_hosts"
56+
ssh-keygen -R $SSH_HOST
57+
ssh-keyscan -H $SSH_HOST >> ~/.ssh/known_hosts
58+
fi
4259

4360
mkdir -p "$WORKING_DIRECTORY"
4461
cd $WORKING_DIRECTORY

0 commit comments

Comments
 (0)