Skip to content

Fix error missing tini; use sbin #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
chad-10e wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix error missing tini; use sbin #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b39b37e
Fix error missing tini; use sbin
chad-10e Apr 14, 2017
061a95c
Fix install to work when running "make"
chad-10e May 23, 2017
28a417a
Add restart policy to container so that it starts when docker is started
sambernard Jul 19, 2017
60f293c
Merge pull request #1 from 10eTechnology/container-restart-policy
chad-10e Jul 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
3 changes: 1 addition & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
all:
all: install
./pinata-build-sshd.sh
@echo Please run "make install"

PREFIX ?= /usr/local
BINDIR ?= $(PREFIX)/bin
Expand Down
1 change: 0 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions pinata-ssh-forward.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down