Merge branch 'nutomic-multiple-instances' into dev

diff --cc .gitignore
Simple merge

diff --cc ansible/templates/docker-compose.yml
index ffd5b9c2b085ffeca88ec5ea2159263b392380cc,e96b312cd6797d8dfe4d4155dc39f04b084cc9f4..022b44ddabbdefb659627a1c49597fdb7efca51c
--- 1/ansible/templates/docker-compose.yml
--- 2/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: