Merge pull request #70 from konsulting/feature/ssh-agent

Add SSH agent
konsulting · Oct 10, 2019 · 3ee5ba8 · 3ee5ba8
2 parents 5e38657 + 1d02d42
commit 3ee5ba8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 0 deletions.
diff --git a/resources/image_sets/konsulting/porter-ubuntu/docker_compose/node.blade.php b/resources/image_sets/konsulting/porter-ubuntu/docker_compose/node.blade.php
@@ -8,6 +8,7 @@
       - {{ $home }}:/srv/app
       - {{ $libraryPath }}/config/user/ssh:/root/.ssh
       - {{ $libraryPath }}/config/node/bash_history:/home/node/.bash_history
+      - {{ $libraryPath }}/config/user/bashrc:/root/.bashrc
     networks:
       - porter
     ports:

diff --git a/resources/image_sets/konsulting/porter-ubuntu/docker_compose/php_cli.blade.php b/resources/image_sets/konsulting/porter-ubuntu/docker_compose/php_cli.blade.php
@@ -12,6 +12,7 @@
       - {{ $libraryPath }}/config/{{ $version->cli_name }}/php.ini:/etc/php/{{ $version->version_number }}/cli/php.ini
       - {{ $libraryPath }}/config/{{ $version->cli_name }}/xdebug.ini:/etc/php/{{ $version->version_number }}/cli/conf.d/xdebug.ini
       - {{ $libraryPath }}/config/{{ $version->cli_name }}/bash_history:/root/.bash_history
+      - {{ $libraryPath }}/config/user/bashrc:/root/.bashrc
     environment:
       - HOST_MACHINE_NAME={{ $host_machine_name }}
       - RUNNING_ON_PORTER=true
diff --git a/resources/stubs/config/user/bashrc b/resources/stubs/config/user/bashrc
@@ -0,0 +1,2 @@
+eval $(ssh-agent -s)
+alias key='ssh-add /root/.ssh/id_rsa'