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.ja.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.ja.md')
| -rw-r--r-- | docs/docker.ja.md | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/docs/docker.ja.md b/docs/docker.ja.md index 9d702fa795..4aa84675e0 100644 --- a/docs/docker.ja.md +++ b/docs/docker.ja.md @@ -9,9 +9,17 @@ Dockerを使ったMisskey構築方法 *1.* Misskeyのダウンロード ---------------------------------------------------------------- -1. `git clone -b master git://github.com/syuilo/misskey.git` masterブランチからMisskeyレポジトリをクローン -2. `cd misskey` misskeyディレクトリに移動 -3. `git checkout $(git tag -l | grep -Ev -- '-(rc|alpha)\.[0-9]+$' | sort -V | tail -n 1)` [最新のリリース](https://github.com/syuilo/misskey/releases/latest)を確認 +1. masterブランチからMisskeyレポジトリをクローン + + `git clone -b master git://github.com/syuilo/misskey.git` + +2. misskeyディレクトリに移動 + + `cd misskey` + +3. [最新のリリース](https://github.com/syuilo/misskey/releases/latest)を確認 + + `git checkout master` *2.* 設定ファイルの作成と編集 ---------------------------------------------------------------- @@ -71,9 +79,9 @@ docker-compose run --rm web npm run init `docker-compose up -d`するだけです。GLHF! ### Misskeyを最新バージョンにアップデートする方法: -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. [ChangeLog](../CHANGELOG.md)でマイグレーション情報を確認する |