diff options
| author | ArthurHoaro <arthur@hoa.ro> | 2020-11-10 10:44:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-10 10:44:50 +0100 |
| commit | 325cc8adadacef7c4d2d0aa2d26c9d87ce216058 (patch) | |
| tree | c7aa4e60d64e279ce0489dc53331f1b2f2a2f3de /doc | |
| parent | 8affa2243159052675da7e23b737c76f6b43aeed (diff) | |
| parent | b7c50a58dedc00a6d34793fc3393aaabf808ab94 (diff) | |
| download | Shaarli-325cc8adadacef7c4d2d0aa2d26c9d87ce216058.tar.gz Shaarli-325cc8adadacef7c4d2d0aa2d26c9d87ce216058.tar.zst Shaarli-325cc8adadacef7c4d2d0aa2d26c9d87ce216058.zip | |
Merge pull request #1634 from ArthurHoaro/fix/docker-compose
Docker-compose: fix SSL certificate + add parameter for Docker tag
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/md/Docker.md | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/doc/md/Docker.md b/doc/md/Docker.md index c152fe92..fc406c00 100644 --- a/doc/md/Docker.md +++ b/doc/md/Docker.md | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | |||
| 1 | # Docker | 2 | # Docker |
| 2 | 3 | ||
| 3 | [Docker](https://docs.docker.com/get-started/overview/) is an open platform for developing, shipping, and running applications | 4 | [Docker](https://docs.docker.com/get-started/overview/) is an open platform for developing, shipping, and running applications |
| @@ -113,9 +114,11 @@ $ mkdir shaarli && cd shaarli | |||
| 113 | # Download the latest version of Shaarli's docker-compose.yml | 114 | # Download the latest version of Shaarli's docker-compose.yml |
| 114 | $ curl -L https://raw.githubusercontent.com/shaarli/Shaarli/latest/docker-compose.yml -o docker-compose.yml | 115 | $ curl -L https://raw.githubusercontent.com/shaarli/Shaarli/latest/docker-compose.yml -o docker-compose.yml |
| 115 | # Create the .env file and fill in your VPS and domain information | 116 | # Create the .env file and fill in your VPS and domain information |
| 116 | # (replace <MY_SHAARLI_DOMAIN> and <MY_CONTACT_EMAIL> with your actual information) | 117 | # (replace <shaarli.mydomain.org>, <admin@mydomain.org> and <latest> with your actual information) |
| 117 | $ echo 'SHAARLI_VIRTUAL_HOST=shaarli.mydomain.org' > .env | 118 | $ echo 'SHAARLI_VIRTUAL_HOST=shaarli.mydomain.org' > .env |
| 118 | $ echo 'SHAARLI_LETSENCRYPT_EMAIL=admin@mydomain.org' >> .env | 119 | $ echo 'SHAARLI_LETSENCRYPT_EMAIL=admin@mydomain.org' >> .env |
| 120 | # Available Docker tags can be found at https://hub.docker.com/r/shaarli/shaarli/tags | ||
| 121 | $ echo 'SHAARLI_DOCKER_TAG=latest' >> .env | ||
| 119 | # Pull the Docker images | 122 | # Pull the Docker images |
| 120 | $ docker-compose pull | 123 | $ docker-compose pull |
| 121 | # Run! | 124 | # Run! |
| @@ -224,4 +227,4 @@ $ docker system prune | |||
| 224 | - [docker pull](https://docs.docker.com/engine/reference/commandline/pull/) | 227 | - [docker pull](https://docs.docker.com/engine/reference/commandline/pull/) |
| 225 | - [docker run](https://docs.docker.com/engine/reference/commandline/run/) | 228 | - [docker run](https://docs.docker.com/engine/reference/commandline/run/) |
| 226 | - [docker-compose logs](https://docs.docker.com/compose/reference/logs/) | 229 | - [docker-compose logs](https://docs.docker.com/compose/reference/logs/) |
| 227 | - Træfik: [Getting Started](https://docs.traefik.io/), [Docker backend](https://docs.traefik.io/configuration/backends/docker/), [Let's Encrypt](https://docs.traefik.io/user-guide/docker-and-lets-encrypt/), [Docker image](https://hub.docker.com/_/traefik/) \ No newline at end of file | 230 | - Træfik: [Getting Started](https://docs.traefik.io/), [Docker backend](https://docs.traefik.io/configuration/backends/docker/), [Let's Encrypt](https://docs.traefik.io/user-guide/docker-and-lets-encrypt/), [Docker image](https://hub.docker.com/_/traefik/) |