From b39b37e6bd09646e40829375b4b7253bb2fd0042 Mon Sep 17 00:00:00 2001 From: Chad Wyszynski Date: Fri, 14 Apr 2017 14:09:55 -0700 Subject: [PATCH 1/3] Fix error missing tini; use sbin --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 09e82d4..8bf3f66 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,5 +8,5 @@ RUN mkdir /root/.ssh && \ COPY ssh-find-agent.sh /root/ssh-find-agent.sh EXPOSE 22 VOLUME ["/root/.ssh/authorized_keys"] -ENTRYPOINT ["/usr/bin/tini","--"] +ENTRYPOINT ["/sbin/tini","--"] CMD ["/usr/sbin/sshd","-D"] From 061a95c089ded0ed00404ba8a6dc1cb7c81c474e Mon Sep 17 00:00:00 2001 From: Chad Wyszynski Date: Tue, 23 May 2017 11:50:12 -0700 Subject: [PATCH 2/3] Fix install to work when running "make" --- Makefile | 3 +-- README.md | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 49c0488..0a79234 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,5 @@ -all: +all: install ./pinata-build-sshd.sh - @echo Please run "make install" PREFIX ?= /usr/local BINDIR ?= $(PREFIX)/bin diff --git a/README.md b/README.md index 1389361..781d3bd 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,6 @@ Assuming you have a `/usr/local` ``` $ git clone git://github.com/avsm/docker-ssh-agent-forward $ make -$ make install ``` On every boot, do: From 28a417a3e4e370b4d73af86adb1333a2949bbc0a Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 19 Jul 2017 10:31:56 -0700 Subject: [PATCH 3/3] Add restart policy to container so that it starts when docker is started --- pinata-ssh-forward.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pinata-ssh-forward.sh b/pinata-ssh-forward.sh index 4b236d4..3b4723a 100755 --- a/pinata-ssh-forward.sh +++ b/pinata-ssh-forward.sh @@ -10,6 +10,7 @@ rm -rf ${LOCAL_STATE} mkdir -p ${LOCAL_STATE} docker run --name ${CONTAINER_NAME} \ + --restart always \ -v ~/.ssh/id_rsa.pub:/root/.ssh/authorized_keys \ -v ${LOCAL_STATE}:/tmp \ -d -p ${LOCAL_PORT}:22 ${IMAGE_NAME} > /dev/null