Merge pull request #3305 from rvaralda/master

feat(builder): add ssh key variable to support private repositories

Author: mboersma

builder/image/slugbuilder/builder/build.sh

@@ -87,6 +87,18 @@ if [[ -n "$BUILDPACK_URL" ]]; then
         committish="master"
     fi
 
+    if [[ -n "$SSH_KEY" ]]; then
+        mkdir -p ~/.ssh/
+        chmod 700 ~/.ssh/
+
+        echo $SSH_KEY | base64 -d > ~/.ssh/id_rsa
+        chmod 400 ~/.ssh/id_rsa
+
+        echo 'StrictHostKeyChecking=no' > ~/.ssh/config
+        chmod 600 ~/.ssh/config
+
+    fi
+
     set +e
     git clone --branch "$committish" --depth=1 "$url" "$buildpack" &> /dev/null
     SHALLOW_CLONED=$?

client/deis.py

@@ -48,6 +48,7 @@
 from itertools import cycle
 from threading import Event
 from threading import Thread
+from base64 import b64encode
 import glob
 import json
 import locale
@@ -1057,6 +1058,18 @@ def config_set(self, args):
         if not app:
             app = self._session.app
         values = dictify(args['<var>=<value>'])
+        if values.get('SSH_KEY'):
+            if os.path.isfile(values.get('SSH_KEY')):
+                with open(values.get('SSH_KEY')) as f:
+                    ssh_key = f.read()
+            else:
+                ssh_key = values['SSH_KEY']
+            match = re.match(r'^-.+ .SA PRIVATE KEY-*', ssh_key)
+            if match:
+                values['SSH_KEY'] = b64encode(ssh_key)
+            else:
+                self._logger.error("Could not parse SSH private key {}".format(ssh_key))
+                sys.exit(1)
         self._config_set(app, values)
 
     def _config_set(self, app, values):

docs/using_deis/using-buildpacks.rst

@@ -27,6 +27,29 @@ Use ``deis create`` to create an application on the :ref:`controller`.
     Creating application... done, created unisex-huntress
     Git remote deis added
 
+Optional: Add SSH KEY to use private repositories
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+To pull code from private repositories, you'll need to provide Deis with a private SSH key which has access.
+
+You can do so with deis client:
+
+
+Using private key file:
+
+.. code-block:: console
+
+    $ deis config:set SSH_KEY=/home/user/.ssh/id_rsa
+
+
+You can also use a raw key instead of a private key file:
+
+.. code-block:: console
+
+    $ deis config:set SSH_KEY="""-----BEGIN RSA PRIVATE KEY-----
+    (...)
+    -----END RSA PRIVATE KEY-----"""
+
 Push to Deploy
 --------------
 Use ``git push deis master`` to deploy your application.