From d09cddde8d9833e71463f202f52b94e5c2b9e95a Mon Sep 17 00:00:00 2001 From: Ruslan Gainutdinov Date: Mon, 10 Apr 2023 12:23:06 +0300 Subject: [PATCH 1/4] Update README.md Add sample commands to bootstrap non-root ssh server. --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 531b2408..69af95c5 100644 --- a/README.md +++ b/README.md @@ -191,6 +191,11 @@ ssh: user: app ``` +If you are using non-root user, you need to *bootstrap* your server manually, before using it with mrsk. Here is some bootstrap one-liners for popular VMs: + +* Amazon Linux 2: `sudo yum update -y; sudo yum install -y docker curl git; sudo usermod -a -G docker ec2-user; sudo chkconfig docker on; sudo service docker start` +* Ubuntu: `sudo apt update; sudo apt upgrade -y; sudo apt install docker curl git; sudo usermod -a -G docker ubuntu` + ### Using a proxy SSH host If you need to connect to server through a proxy host, you can use `ssh/proxy`: From fca5b11682022d0361de4a7d2e1128f22e2c51b7 Mon Sep 17 00:00:00 2001 From: Ruslan Gainutdinov Date: Mon, 10 Apr 2023 12:26:57 +0300 Subject: [PATCH 2/4] Update README.md Use docker.io on Ubuntu --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 69af95c5..67e1402a 100644 --- a/README.md +++ b/README.md @@ -194,7 +194,7 @@ ssh: If you are using non-root user, you need to *bootstrap* your server manually, before using it with mrsk. Here is some bootstrap one-liners for popular VMs: * Amazon Linux 2: `sudo yum update -y; sudo yum install -y docker curl git; sudo usermod -a -G docker ec2-user; sudo chkconfig docker on; sudo service docker start` -* Ubuntu: `sudo apt update; sudo apt upgrade -y; sudo apt install docker curl git; sudo usermod -a -G docker ubuntu` +* Ubuntu: `sudo apt update; sudo apt upgrade -y; sudo apt install -y docker.io curl git; sudo usermod -a -G docker ubuntu` ### Using a proxy SSH host From 2a3e576182e427330fcce7b57e6a2abf7f04b993 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Mon, 10 Apr 2023 14:24:51 +0200 Subject: [PATCH 3/4] More explicit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 67e1402a..9b283ff0 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ If you have a Ruby environment available, you can install MRSK globally with: gem install mrsk ``` -...otherwise, you can run a dockerized version via an alias (add this to your ${SHELL}rc to simplify re-use): +...otherwise, you can run a dockerized version via an alias (add this to your .bashrc or similar to simplify re-use): ```sh alias mrsk='docker run --rm -it -v $HOME/.ssh:/root/.ssh -v /var/run/docker.sock:/var/run/docker.sock -v ${PWD}/:/workdir ghcr.io/mrsked/mrsk' From f386c3bdab43b388ba20d9c961a7905c722b9bdc Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Mon, 10 Apr 2023 14:26:49 +0200 Subject: [PATCH 4/4] Make it explicit, focus on Ubuntu --- README.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 9b283ff0..e93d5196 100644 --- a/README.md +++ b/README.md @@ -191,10 +191,14 @@ ssh: user: app ``` -If you are using non-root user, you need to *bootstrap* your server manually, before using it with mrsk. Here is some bootstrap one-liners for popular VMs: +If you are using non-root user, you need to bootstrap your servers manually, before using them with MRSK. On Ubuntu, you'd do: -* Amazon Linux 2: `sudo yum update -y; sudo yum install -y docker curl git; sudo usermod -a -G docker ec2-user; sudo chkconfig docker on; sudo service docker start` -* Ubuntu: `sudo apt update; sudo apt upgrade -y; sudo apt install -y docker.io curl git; sudo usermod -a -G docker ubuntu` +```bash +sudo apt update +sudo apt upgrade -y +sudo apt install -y docker.io curl git +sudo usermod -a -G docker ubuntu +``` ### Using a proxy SSH host