kubernetes
/
git-sync
mirror of https://github.com/kubernetes/git-sync.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #29 from ideahitme/enable-git-ssh-command-env 

clean up Dockerfile, remove ssh-wrapper.sh and set env var
This commit is contained in:
Tim Hockin 2017-01-26 22:15:40 -08:00 committed by GitHub
parent 5e2d975c63 b8cc35f4fc
commit c2a9f9ff8d
3 changed files with 9 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile.in
View File

@ -19,15 +19,11 @@ MAINTAINER Tim Hockin <thockin@google.com>
ADD bin/ARG_ARCH/ARG_BIN /ARG_BIN ADD bin/ARG_ARCH/ARG_BIN /ARG_BIN
ENV GIT_SYNC_DEST /git ENV GIT_SYNC_DEST /git
# Move the existing SSH binary, then replace it with the wrapper script
RUN apk update --no-cache && apk add \ RUN apk update --no-cache && apk add \
ca-certificates \ ca-certificates \
coreutils \ coreutils \
git \ git \
openssh-client openssh-client
RUN mv /usr/bin/ssh /usr/bin/ssh-binary
ADD ssh-wrapper.sh /usr/bin/ssh
RUN chmod 755 /usr/bin/ssh
USER nobody:nobody USER nobody:nobody
ENTRYPOINT ["/ARG_BIN"] ENTRYPOINT ["/ARG_BIN"]

10
cmd/git-sync/main.go
View File

@ -471,7 +471,9 @@ func setupGitAuth(username, password, gitURL string) error {
func setupGitSSH() error { func setupGitSSH() error {
log.V(1).Infof("setting up git SSH credentials") log.V(1).Infof("setting up git SSH credentials")
fileInfo, err := os.Stat("/etc/git-secret/ssh") var pathToSSHSecret = "/etc/git-secret/ssh"
fileInfo, err := os.Stat(pathToSSHSecret)
if err != nil { if err != nil {
return fmt.Errorf("error: could not find SSH key Secret: %v", err) return fmt.Errorf("error: could not find SSH key Secret: %v", err)
} }
@ -480,5 +482,11 @@ func setupGitSSH() error {
return fmt.Errorf("Permissions %s for SSH key are too open. It is recommended to mount secret volume with `defaultMode: 256` (decimal number for octal 0400).", fileInfo.Mode()) return fmt.Errorf("Permissions %s for SSH key are too open. It is recommended to mount secret volume with `defaultMode: 256` (decimal number for octal 0400).", fileInfo.Mode())
} }
//set env variable GIT_SSH_COMMAND to force git use customized ssh command
err = os.Setenv("GIT_SSH_COMMAND", fmt.Sprintf("ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i %s", pathToSSHSecret))
if err != nil {
return fmt.Errorf("Failed to set the GIT_SSH_COMMAND env var: %v", err)
}
return nil return nil
} }

25
ssh-wrapper.sh
View File

@ -1,25 +0,0 @@
#!/bin/sh
# Copyright 2016 The Kubernetes Authors All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# This script wraps the standard SSH binary so that the mounted SSH key can be used without user confirmation.
# In the Dockerfile, the original SSH binary is moved to /usr/bin/ssh-binary (and is then used as the base command here).
# This script is moved to /usr/bin/ssh so that Git uses it by default.
# The "UserKnownHostsFile" and "StrictHostKeyChecking" options avoid the user confirmation check.
# The -i flag specifies where the SSH key is located.
secret_path=/etc/git-secret/ssh
ssh-binary -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i $secret_path "$@"