From: Dessalines <tyhou13@gmx.com>
Date: Thu, 19 Mar 2020 02:37:33 +0000 (-0400)
Subject: Merge branch 'nutomic-multiple-instances' into dev
X-Git-Url: http://these/git/%24%7B%60data:application/static/%7B%60https:/%7B%60/feeds/%7BcanonicalUrl%7D?a=commitdiff_plain;h=f85242af280788eacc8f758d2c84218a762de55d;p=lemmy.git

Merge branch 'nutomic-multiple-instances' into dev
---

f85242af280788eacc8f758d2c84218a762de55d
diff --cc ansible/templates/docker-compose.yml
index ffd5b9c2,e96b312c..022b44dd
--- a/ansible/templates/docker-compose.yml
+++ b/ansible/templates/docker-compose.yml
@@@ -4,10 -4,8 +4,10 @@@ services
    lemmy:
      image: {{ lemmy_docker_image }}
      ports:
-       - "127.0.0.1:8536:8536"
+       - "127.0.0.1:{{ lemmy_port }}:8536"
      restart: always
 +    environment:
 +      - RUST_LOG=debug
      volumes:
        - ./lemmy.hjson:/config/config.hjson:ro
      depends_on: