diff options
| author | かひわし4（バージョン1） <khws4v1@gmail.com> | 2019-04-17 02:15:27 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2019-04-17 02:15:27 +0900 |
| commit | 2e55aea584e11f7155636f2d30ebebc4d8dabc90 (patch) | |
| tree | ba151568c7ea6de84e70a3f3f7840cb651075103 /docs/docker.en.md | |
| parent | smallint (diff) | |
| download | sharkey-2e55aea584e11f7155636f2d30ebebc4d8dabc90.tar.gz sharkey-2e55aea584e11f7155636f2d30ebebc4d8dabc90.tar.bz2 sharkey-2e55aea584e11f7155636f2d30ebebc4d8dabc90.zip | |
Doc: Update setup documents (#4680)
* Doc: Update setup documents
Use GitHub api to checkout latest release instead of "git tag" command
which cannot accurately determine prerelease tag.
Also, Changed numbered list format because
the shell command is too long to fit on one line.
* Doc: Use tab instead of spaces
* Doc: Use master branch as latest release tag
master branch and latest release is the same.
master branch merges develop branch with each latest release.
Diffstat (limited to 'docs/docker.en.md')
| -rw-r--r-- | docs/docker.en.md | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/docs/docker.en.md b/docs/docker.en.md index 344279083b..701514e45f 100644 --- a/docs/docker.en.md +++ b/docs/docker.en.md @@ -9,9 +9,17 @@ This guide describes how to install and setup Misskey with Docker. *1.* Download Misskey ---------------------------------------------------------------- -1. `git clone -b master git://github.com/syuilo/misskey.git` Clone Misskey repository's master branch. -2. `cd misskey` Move to misskey directory. -3. `git checkout $(git tag -l | grep -Ev -- '-(rc|alpha)\.[0-9]+$' | sort -V | tail -n 1)` Checkout to the [latest release](https://github.com/syuilo/misskey/releases/latest) tag. +1. Clone Misskey repository's master branch. + + `git clone -b master git://github.com/syuilo/misskey.git` + +2. Move to misskey directory. + + `cd misskey` + +3. Checkout to the [latest release](https://github.com/syuilo/misskey/releases/latest) tag. + + `git checkout master` *2.* Configure Misskey ---------------------------------------------------------------- @@ -71,9 +79,9 @@ Well done! Now you have an environment to run Misskey. Just `docker-compose up -d`. GLHF! ### How to update your Misskey server to the latest version -1. `git fetch` -2. `git stash` -3. `git checkout $(git tag -l | grep -Ev -- '-(rc|alpha)\.[0-9]+$' | sort -V | tail -n 1)` +1. `git stash` +2. `git checkout master` +3. `git pull` 4. `git stash pop` 5. `docker-compose build` 6. Check [ChangeLog](../CHANGELOG.md) for migration information |