diff options
author | ArthurHoaro <arthur@hoa.ro> | 2017-10-22 14:56:26 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-22 14:56:26 +0200 |
commit | 2e6314af312229467ca63b6dc0c337f92eb5ddeb (patch) | |
tree | 86ce8a41994828c636fb39abb29f47c2fc14f35c /doc/md | |
parent | d8acf8550480694d050091e270a06c01e7b313f0 (diff) | |
parent | cfcc38192aff2bcabafa5cc67f18a5026255c96d (diff) | |
download | Shaarli-2e6314af312229467ca63b6dc0c337f92eb5ddeb.tar.gz Shaarli-2e6314af312229467ca63b6dc0c337f92eb5ddeb.tar.zst Shaarli-2e6314af312229467ca63b6dc0c337f92eb5ddeb.zip |
Merge pull request #1002 from ArthurHoaro/doc/install-docker
Docs: mention Docker in the download & install page
Diffstat (limited to 'doc/md')
-rw-r--r-- | doc/md/Download-and-Installation.md | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/doc/md/Download-and-Installation.md b/doc/md/Download-and-Installation.md index 59a1b7da..be848c97 100644 --- a/doc/md/Download-and-Installation.md +++ b/doc/md/Download-and-Installation.md | |||
@@ -4,11 +4,18 @@ Document Root (or directly at the document root). | |||
4 | Also, please make sure your server meets the [requirements](Server-requirements) | 4 | Also, please make sure your server meets the [requirements](Server-requirements) |
5 | and is properly [configured](Server-configuration). | 5 | and is properly [configured](Server-configuration). |
6 | 6 | ||
7 | Several releases are available: | 7 | Multiple releases branches are available: |
8 | |||
9 | - latest (last release) | ||
10 | - stable (previous major release) | ||
11 | - master (development) | ||
12 | |||
13 | Using one of the following methods: | ||
8 | 14 | ||
9 | - by downloading full release archives including all dependencies | 15 | - by downloading full release archives including all dependencies |
10 | - by downloading Github archives | 16 | - by downloading Github archives |
11 | - by cloning the Git repository | 17 | - by cloning the Git repository |
18 | - using Docker: [see the documentation](docker/shaarli-images) | ||
12 | 19 | ||
13 | --- | 20 | --- |
14 | 21 | ||
@@ -28,13 +35,14 @@ $ unzip shaarli-v0.9.1-full.zip | |||
28 | $ mv Shaarli /path/to/shaarli/ | 35 | $ mv Shaarli /path/to/shaarli/ |
29 | ``` | 36 | ``` |
30 | 37 | ||
31 | In most cases, download Shaarli from the [releases](https://github.com/shaarli/Shaarli/releases) page. Cloning using `git` or downloading Github branches as zip files requires additional steps (see below).| | 38 | In most cases, download Shaarli from the [releases](https://github.com/shaarli/Shaarli/releases) page. |
39 | Cloning using `git` or downloading Github branches as zip files requires additional steps (see below). | ||
32 | 40 | ||
33 | ### Using git | 41 | ### Using git |
34 | 42 | ||
35 | ``` | 43 | ``` |
36 | $ mkdir -p /path/to/shaarli && cd /path/to/shaarli/ | 44 | $ mkdir -p /path/to/shaarli && cd /path/to/shaarli/ |
37 | $ git clone -b v0.9 https://github.com/shaarli/Shaarli.git . | 45 | $ git clone -b latest https://github.com/shaarli/Shaarli.git . |
38 | $ composer install --no-dev --prefer-dist | 46 | $ composer install --no-dev --prefer-dist |
39 | $ make translate | 47 | $ make translate |
40 | ``` | 48 | ``` |