From 7d683d5cee7887640b0b2473cba87b0e25d5b98d Mon Sep 17 00:00:00 2001
From: Felix Ableitner <me@nutomic.com>
Date: Fri, 5 Jun 2020 19:37:01 +0200
Subject: [PATCH] Disable pictshare backdoor, adjust all docker-compose files

---
 ansible/templates/docker-compose.yml | 6 +++++-
 docker/dev/docker-compose.yml        | 6 +++++-
 docker/prod/docker-compose.yml       | 2 ++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/ansible/templates/docker-compose.yml b/ansible/templates/docker-compose.yml
index 9ec1bfbc2..dc7f9a373 100644
--- a/ansible/templates/docker-compose.yml
+++ b/ansible/templates/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '3.3'
+version: '2.2'
 
 services:
   lemmy:
@@ -32,6 +32,9 @@ services:
     volumes:
       - ./volumes/pictshare:/usr/share/nginx/html/data
     restart: always
+    mem_limit: 100m
+    environment:
+      - AUTO_UPDATE=false
 
   iframely:
     image: dogbin/iframely:latest
@@ -40,6 +43,7 @@ services:
     volumes:
       - ./iframely.config.local.js:/iframely/config.local.js:ro
     restart: always
+    mem_limit: 100m
 
   postfix:
     image: mwader/postfix-relay
diff --git a/docker/dev/docker-compose.yml b/docker/dev/docker-compose.yml
index 1702f66d3..7899d506a 100644
--- a/docker/dev/docker-compose.yml
+++ b/docker/dev/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '3.3'
+version: '2.2'
 
 services:
   postgres:
@@ -34,6 +34,9 @@ services:
     volumes:
       - ./volumes/pictshare:/usr/share/nginx/html/data
     restart: always
+    mem_limit: 100m
+    environment:
+      - AUTO_UPDATE=false
 
   iframely:
     image: dogbin/iframely:latest
@@ -42,3 +45,4 @@ services:
     volumes:
       - ../iframely.config.local.js:/iframely/config.local.js:ro
     restart: always
+    mem_limit: 100m
diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml
index db6e40045..c9b90aee8 100644
--- a/docker/prod/docker-compose.yml
+++ b/docker/prod/docker-compose.yml
@@ -33,6 +33,8 @@ services:
       - ./volumes/pictshare:/usr/share/nginx/html/data
     restart: always
     mem_limit: 100m
+    environment:
+      - AUTO_UPDATE=false
 
   iframely:
     image: dogbin/iframely:latest