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

Merge pull request #1634 from ArthurHoaro/fix/docker-compose

Browse source 
Docker-compose: fix SSL certificate + add parameter for Docker tag
This commit is contained in:
ArthurHoaro 2020-11-10 10:44:50 +01:00 committed by GitHub
commit 325cc8adad
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
doc/md/Docker.md
View file

@ -1,3 +1,4 @@
# Docker # Docker
[Docker](https://docs.docker.com/get-started/overview/) is an open platform for developing, shipping, and running applications [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
# Download the latest version of Shaarli's docker-compose.yml # Download the latest version of Shaarli's docker-compose.yml
$ curl -L https://raw.githubusercontent.com/shaarli/Shaarli/latest/docker-compose.yml -o docker-compose.yml $ curl -L https://raw.githubusercontent.com/shaarli/Shaarli/latest/docker-compose.yml -o docker-compose.yml
# Create the .env file and fill in your VPS and domain information # Create the .env file and fill in your VPS and domain information
# (replace <MY_SHAARLI_DOMAIN> and <MY_CONTACT_EMAIL> with your actual information) # (replace <shaarli.mydomain.org>, <admin@mydomain.org> and <latest> with your actual information)
$ echo 'SHAARLI_VIRTUAL_HOST=shaarli.mydomain.org' > .env $ echo 'SHAARLI_VIRTUAL_HOST=shaarli.mydomain.org' > .env
$ echo 'SHAARLI_LETSENCRYPT_EMAIL=admin@mydomain.org' >> .env $ echo 'SHAARLI_LETSENCRYPT_EMAIL=admin@mydomain.org' >> .env
# Available Docker tags can be found at https://hub.docker.com/r/shaarli/shaarli/tags
$ echo 'SHAARLI_DOCKER_TAG=latest' >> .env
# Pull the Docker images # Pull the Docker images
$ docker-compose pull $ docker-compose pull
# Run! # Run!
@ -224,4 +227,4 @@ $ docker system prune
- [docker pull](https://docs.docker.com/engine/reference/commandline/pull/) - [docker pull](https://docs.docker.com/engine/reference/commandline/pull/)
- [docker run](https://docs.docker.com/engine/reference/commandline/run/) - [docker run](https://docs.docker.com/engine/reference/commandline/run/)
- [docker-compose logs](https://docs.docker.com/compose/reference/logs/) - [docker-compose logs](https://docs.docker.com/compose/reference/logs/)
- 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/) - 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/)

9
docker-compose.yml
View file

@ -2,12 +2,13 @@
# Shaarli - Docker Compose example configuration # Shaarli - Docker Compose example configuration
# #
# See: # See:
# - https://shaarli.readthedocs.io/en/master/docker/shaarli-images/ # - https://shaarli.readthedocs.io/en/master/Docker/#docker-compose
# - https://shaarli.readthedocs.io/en/master/guides/install-shaarli-with-debian9-and-docker/
# #
# Environment variables: # Environment variables:
# - SHAARLI_VIRTUAL_HOST Fully Qualified Domain Name for the Shaarli instance # - SHAARLI_VIRTUAL_HOST Fully Qualified Domain Name for the Shaarli instance
# - SHAARLI_LETSENCRYPT_EMAIL Contact email for certificate renewal # - SHAARLI_LETSENCRYPT_EMAIL Contact email for certificate renewal
# - SHAARLI_DOCKER_TAG Shaarli docker tag to use
# See: https://hub.docker.com/r/shaarli/shaarli/tags
version: '3' version: '3'
networks: networks:
@ -20,7 +21,7 @@ volumes:
services: services:
shaarli: shaarli:
image: shaarli/shaarli:master image: shaarli/shaarli:${SHAARLI_DOCKER_TAG}
build: ./ build: ./
networks: networks:
- http-proxy - http-proxy
@ -40,7 +41,7 @@ services:
- "--entrypoints=Name:https Address::443 TLS" - "--entrypoints=Name:https Address::443 TLS"
- "--retry" - "--retry"
- "--docker" - "--docker"
- "--docker.domain=docker.localhost" - "--docker.domain=${SHAARLI_VIRTUAL_HOST}"
- "--docker.exposedbydefault=true" - "--docker.exposedbydefault=true"
- "--docker.watch=true" - "--docker.watch=true"
- "--acme" - "--acme"