Knah-Tsaeb/MyShaarli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1002 from ArthurHoaro/doc/install-docker

Browse source 
Docs: mention Docker in the download & install page
This commit is contained in:
ArthurHoaro 2017-10-22 14:56:26 +02:00 committed by GitHub
parent d8acf85504 cfcc38192a
commit 2e6314af31
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
doc/md/Download-and-Installation.md
View file

@ -4,11 +4,18 @@ Document Root (or directly at the document root).
Also, please make sure your server meets the [requirements](Server-requirements) Also, please make sure your server meets the [requirements](Server-requirements)
and is properly [configured](Server-configuration). and is properly [configured](Server-configuration).
Several releases are available: Multiple releases branches are available:
- latest (last release)
- stable (previous major release)
- master (development)
Using one of the following methods:
- by downloading full release archives including all dependencies - by downloading full release archives including all dependencies
- by downloading Github archives - by downloading Github archives
- by cloning the Git repository - by cloning the Git repository
- using Docker: [see the documentation](docker/shaarli-images)
--- ---
@ -28,13 +35,14 @@ $ unzip shaarli-v0.9.1-full.zip
$ mv Shaarli /path/to/shaarli/ $ mv Shaarli /path/to/shaarli/
``` ```
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).| 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).
### Using git ### Using git
``` ```
$ mkdir -p /path/to/shaarli && cd /path/to/shaarli/ $ mkdir -p /path/to/shaarli && cd /path/to/shaarli/
$ git clone -b v0.9 https://github.com/shaarli/Shaarli.git . $ git clone -b latest https://github.com/shaarli/Shaarli.git .
$ composer install --no-dev --prefer-dist $ composer install --no-dev --prefer-dist
$ make translate $ make translate
``` ```