From b2a89cd21772afbec1e5eb00bf3b10720fae6b14 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Tue, 21 Apr 2020 20:43:38 -0400 Subject: Version v0.6.52 --- docker/prod/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker') diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml index c38bb899..b9e82daf 100644 --- a/docker/prod/docker-compose.yml +++ b/docker/prod/docker-compose.yml @@ -12,7 +12,7 @@ services: restart: always lemmy: - image: dessalines/lemmy:v0.6.51 + image: dessalines/lemmy:v0.6.52 ports: - "127.0.0.1:8536:8536" restart: always -- cgit v1.2.3 From c22090c602098abe29f451c6235fe8179725726a Mon Sep 17 00:00:00 2001 From: Dessalines Date: Wed, 22 Apr 2020 00:30:43 -0400 Subject: Version v0.6.53 --- docker/prod/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker') diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml index b9e82daf..00fe9410 100644 --- a/docker/prod/docker-compose.yml +++ b/docker/prod/docker-compose.yml @@ -12,7 +12,7 @@ services: restart: always lemmy: - image: dessalines/lemmy:v0.6.52 + image: dessalines/lemmy:v0.6.53 ports: - "127.0.0.1:8536:8536" restart: always -- cgit v1.2.3 From 92e4edf9b7af01d43391500f69ac95a619c4d2f6 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Sun, 26 Apr 2020 10:57:27 -0400 Subject: Version v0.6.54 --- docker/prod/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker') diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml index 00fe9410..c6639f57 100644 --- a/docker/prod/docker-compose.yml +++ b/docker/prod/docker-compose.yml @@ -12,7 +12,7 @@ services: restart: always lemmy: - image: dessalines/lemmy:v0.6.53 + image: dessalines/lemmy:v0.6.54 ports: - "127.0.0.1:8536:8536" restart: always -- cgit v1.2.3 From 66134823bffc55cefdb5d14857faa7956a165237 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Mon, 27 Apr 2020 09:07:31 -0400 Subject: Version v0.6.55 --- docker/prod/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker') diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml index c6639f57..65bc9f82 100644 --- a/docker/prod/docker-compose.yml +++ b/docker/prod/docker-compose.yml @@ -12,7 +12,7 @@ services: restart: always lemmy: - image: dessalines/lemmy:v0.6.54 + image: dessalines/lemmy:v0.6.55 ports: - "127.0.0.1:8536:8536" restart: always -- cgit v1.2.3 From 88e1251d6b26411e4253027510e59a06caa72bfe Mon Sep 17 00:00:00 2001 From: Dessalines Date: Sun, 3 May 2020 17:27:25 -0400 Subject: Version v0.6.56 --- docker/prod/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker') diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml index 65bc9f82..b929110d 100644 --- a/docker/prod/docker-compose.yml +++ b/docker/prod/docker-compose.yml @@ -12,7 +12,7 @@ services: restart: always lemmy: - image: dessalines/lemmy:v0.6.55 + image: dessalines/lemmy:v0.6.56 ports: - "127.0.0.1:8536:8536" restart: always -- cgit v1.2.3 From b83aae0b57f79f89c34d7dc9c3433fec64255e18 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Fri, 8 May 2020 14:08:35 -0400 Subject: Version v0.6.57 --- docker/prod/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker') diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml index b929110d..6155ce3a 100644 --- a/docker/prod/docker-compose.yml +++ b/docker/prod/docker-compose.yml @@ -12,7 +12,7 @@ services: restart: always lemmy: - image: dessalines/lemmy:v0.6.56 + image: dessalines/lemmy:v0.6.57 ports: - "127.0.0.1:8536:8536" restart: always -- cgit v1.2.3 From cb8851096405639395dc53865498df4bddf5bf7b Mon Sep 17 00:00:00 2001 From: Dessalines Date: Mon, 11 May 2020 14:04:23 -0400 Subject: Version v0.6.58 --- docker/prod/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker') diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml index 6155ce3a..f9e8c5b9 100644 --- a/docker/prod/docker-compose.yml +++ b/docker/prod/docker-compose.yml @@ -12,7 +12,7 @@ services: restart: always lemmy: - image: dessalines/lemmy:v0.6.57 + image: dessalines/lemmy:v0.6.58 ports: - "127.0.0.1:8536:8536" restart: always -- cgit v1.2.3 From c22310bdaf0d289e83a99aa34e1c015c7078b10e Mon Sep 17 00:00:00 2001 From: Dessalines Date: Mon, 11 May 2020 19:08:28 -0400 Subject: Version v0.6.59 --- docker/prod/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker') diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml index f9e8c5b9..bec44422 100644 --- a/docker/prod/docker-compose.yml +++ b/docker/prod/docker-compose.yml @@ -12,7 +12,7 @@ services: restart: always lemmy: - image: dessalines/lemmy:v0.6.58 + image: dessalines/lemmy:v0.6.59 ports: - "127.0.0.1:8536:8536" restart: always -- cgit v1.2.3 From 155b99b64e9eb82b629a59cbfb763295d8aada35 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Tue, 12 May 2020 15:27:28 -0400 Subject: Version v0.6.60 --- docker/prod/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker') diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml index bec44422..3aefa89f 100644 --- a/docker/prod/docker-compose.yml +++ b/docker/prod/docker-compose.yml @@ -12,7 +12,7 @@ services: restart: always lemmy: - image: dessalines/lemmy:v0.6.59 + image: dessalines/lemmy:v0.6.60 ports: - "127.0.0.1:8536:8536" restart: always -- cgit v1.2.3 From f5e96d9372565b5043664e9103ac9207e2c33840 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Sun, 17 May 2020 16:53:56 -0400 Subject: Version v0.6.61 --- docker/prod/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker') diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml index 3aefa89f..1013ede9 100644 --- a/docker/prod/docker-compose.yml +++ b/docker/prod/docker-compose.yml @@ -12,7 +12,7 @@ services: restart: always lemmy: - image: dessalines/lemmy:v0.6.60 + image: dessalines/lemmy:v0.6.61 ports: - "127.0.0.1:8536:8536" restart: always -- cgit v1.2.3 From 106ce6096b656d072c728f70fd4daafd5ee5efe5 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Sun, 17 May 2020 18:46:15 -0400 Subject: Version v0.6.62 --- docker/prod/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker') diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml index 1013ede9..61df7533 100644 --- a/docker/prod/docker-compose.yml +++ b/docker/prod/docker-compose.yml @@ -12,7 +12,7 @@ services: restart: always lemmy: - image: dessalines/lemmy:v0.6.61 + image: dessalines/lemmy:v0.6.62 ports: - "127.0.0.1:8536:8536" restart: always -- cgit v1.2.3 From 18d0edd4eb088cc99154249545726f502d3a0c83 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Mon, 18 May 2020 09:53:02 -0400 Subject: Version v0.6.63 --- docker/prod/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker') diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml index 61df7533..a910c3ad 100644 --- a/docker/prod/docker-compose.yml +++ b/docker/prod/docker-compose.yml @@ -12,7 +12,7 @@ services: restart: always lemmy: - image: dessalines/lemmy:v0.6.62 + image: dessalines/lemmy:v0.6.63 ports: - "127.0.0.1:8536:8536" restart: always -- cgit v1.2.3 From 4f518a5d92112cc2d00d03ffca1942c0570993c3 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Sun, 24 May 2020 13:25:50 -0400 Subject: Version v0.6.64 --- docker/prod/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker') diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml index a910c3ad..14cc800c 100644 --- a/docker/prod/docker-compose.yml +++ b/docker/prod/docker-compose.yml @@ -12,7 +12,7 @@ services: restart: always lemmy: - image: dessalines/lemmy:v0.6.63 + image: dessalines/lemmy:v0.6.64 ports: - "127.0.0.1:8536:8536" restart: always -- cgit v1.2.3 From e54eac62272d80688100cb897ff8134e01a97702 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Sun, 24 May 2020 18:31:17 -0400 Subject: Adding use_tls to lemmy.hjson for email config. --- docker/lemmy.hjson | 1 + 1 file changed, 1 insertion(+) (limited to 'docker') diff --git a/docker/lemmy.hjson b/docker/lemmy.hjson index b61ea826..8fe9bf55 100644 --- a/docker/lemmy.hjson +++ b/docker/lemmy.hjson @@ -60,6 +60,7 @@ # smtp_password: "" # # address to send emails from, eg "info@your-instance.com" # smtp_from_address: "" +# use_tls: true # } } -- cgit v1.2.3 From 80653a531774291ccd44e7ba6b78fff5502d57f0 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Mon, 25 May 2020 18:48:24 -0400 Subject: Remove federation option from master. (#745) --- docker/lemmy.hjson | 3 --- 1 file changed, 3 deletions(-) (limited to 'docker') diff --git a/docker/lemmy.hjson b/docker/lemmy.hjson index 8fe9bf55..271fc78d 100644 --- a/docker/lemmy.hjson +++ b/docker/lemmy.hjson @@ -23,9 +23,6 @@ jwt_secret: "changeme" # The dir for the front end front_end_dir: "/app/dist" - # whether to enable activitypub federation. this feature is in alpha, do not enable in production, as might - # cause problems like remote instances fetching and permanently storing bad data. - federation_enabled: false # rate limits for various user actions, by user ip rate_limit: { # maximum number of messages created in interval -- cgit v1.2.3 From 847e19f22ddaec1eafa9d47787c017b01bda3082 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Thu, 28 May 2020 14:13:47 -0400 Subject: Version v0.6.65 --- docker/prod/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker') diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml index 14cc800c..d346d042 100644 --- a/docker/prod/docker-compose.yml +++ b/docker/prod/docker-compose.yml @@ -12,7 +12,7 @@ services: restart: always lemmy: - image: dessalines/lemmy:v0.6.64 + image: dessalines/lemmy:v0.6.65 ports: - "127.0.0.1:8536:8536" restart: always -- cgit v1.2.3 From 998b9454b22ebb6f8f77268bea285097dcdc5562 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Tue, 2 Jun 2020 14:05:17 -0400 Subject: Version v0.6.66 --- docker/prod/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker') diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml index d346d042..d604dcac 100644 --- a/docker/prod/docker-compose.yml +++ b/docker/prod/docker-compose.yml @@ -12,7 +12,7 @@ services: restart: always lemmy: - image: dessalines/lemmy:v0.6.65 + image: dessalines/lemmy:v0.6.66 ports: - "127.0.0.1:8536:8536" restart: always -- cgit v1.2.3 From 1e88b815da1225aa0b6caa5bce161983f75c7339 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Tue, 2 Jun 2020 19:29:29 -0400 Subject: Updating pictshare docker image. --- docker/dev/docker-compose.yml | 2 +- docker/prod/docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'docker') diff --git a/docker/dev/docker-compose.yml b/docker/dev/docker-compose.yml index 3c52d1e5..1702f66d 100644 --- a/docker/dev/docker-compose.yml +++ b/docker/dev/docker-compose.yml @@ -28,7 +28,7 @@ services: - iframely pictshare: - image: shtripok/pictshare:latest + image: hascheksolutions/pictshare:latest ports: - "127.0.0.1:8537:80" volumes: diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml index d604dcac..0bcc178b 100644 --- a/docker/prod/docker-compose.yml +++ b/docker/prod/docker-compose.yml @@ -26,7 +26,7 @@ services: - iframely pictshare: - image: shtripok/pictshare:latest + image: hascheksolutions/pictshare:latest ports: - "127.0.0.1:8537:80" volumes: -- cgit v1.2.3 From 59d22ef7753e774d89d5a70877d65a3c6578490a Mon Sep 17 00:00:00 2001 From: Dessalines Date: Tue, 2 Jun 2020 19:59:49 -0400 Subject: Version v0.6.67 --- docker/prod/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker') diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml index 0bcc178b..0287aa9d 100644 --- a/docker/prod/docker-compose.yml +++ b/docker/prod/docker-compose.yml @@ -12,7 +12,7 @@ services: restart: always lemmy: - image: dessalines/lemmy:v0.6.66 + image: dessalines/lemmy:v0.6.67 ports: - "127.0.0.1:8536:8536" restart: always -- cgit v1.2.3 From 361cf995da168b3d6f12c9e540c40a2f7b9e8c6c Mon Sep 17 00:00:00 2001 From: Dessalines Date: Wed, 3 Jun 2020 11:46:09 -0400 Subject: Version v0.6.68 --- docker/prod/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker') diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml index 0287aa9d..677955f8 100644 --- a/docker/prod/docker-compose.yml +++ b/docker/prod/docker-compose.yml @@ -12,7 +12,7 @@ services: restart: always lemmy: - image: dessalines/lemmy:v0.6.67 + image: dessalines/lemmy:v0.6.68 ports: - "127.0.0.1:8536:8536" restart: always -- cgit v1.2.3 From 2e882f75f2d8cd517f965d9c93af5443e957a811 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Wed, 3 Jun 2020 12:11:52 -0400 Subject: Version v0.6.69 --- docker/prod/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker') diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml index 677955f8..fb829529 100644 --- a/docker/prod/docker-compose.yml +++ b/docker/prod/docker-compose.yml @@ -12,7 +12,7 @@ services: restart: always lemmy: - image: dessalines/lemmy:v0.6.68 + image: dessalines/lemmy:v0.6.69 ports: - "127.0.0.1:8536:8536" restart: always -- cgit v1.2.3 From 7c0ea6cfa738c1bef39c91836523d79d433f907e Mon Sep 17 00:00:00 2001 From: Dessalines Date: Thu, 4 Jun 2020 21:42:08 -0400 Subject: Version v0.6.70 --- docker/prod/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker') diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml index fb829529..615423a5 100644 --- a/docker/prod/docker-compose.yml +++ b/docker/prod/docker-compose.yml @@ -12,7 +12,7 @@ services: restart: always lemmy: - image: dessalines/lemmy:v0.6.69 + image: dessalines/lemmy:v0.6.70 ports: - "127.0.0.1:8536:8536" restart: always -- cgit v1.2.3 From 8257b040be3b43a4419611ee712f2e3237d63a72 Mon Sep 17 00:00:00 2001 From: Felix Ableitner Date: Fri, 5 Jun 2020 17:07:38 +0200 Subject: Limit memory usage for pictshare and iframely --- docker/prod/docker-compose.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'docker') diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml index 615423a5..f66a5986 100644 --- a/docker/prod/docker-compose.yml +++ b/docker/prod/docker-compose.yml @@ -1,4 +1,4 @@ -version: '3.3' +version: '2.2' services: postgres: @@ -32,6 +32,7 @@ services: volumes: - ./volumes/pictshare:/usr/share/nginx/html/data restart: always + mem_limit: 100m iframely: image: dogbin/iframely:latest @@ -40,3 +41,4 @@ services: volumes: - ./iframely.config.local.js:/iframely/config.local.js:ro restart: always + mem_limit: 100m -- cgit v1.2.3 From 63ca6e1e24c783aea9b55b2a701f3818a5e329f4 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Fri, 5 Jun 2020 11:49:36 -0400 Subject: Version v0.6.71 --- docker/prod/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker') diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml index 615423a5..bb4975e7 100644 --- a/docker/prod/docker-compose.yml +++ b/docker/prod/docker-compose.yml @@ -12,7 +12,7 @@ services: restart: always lemmy: - image: dessalines/lemmy:v0.6.70 + image: dessalines/lemmy:v0.6.71 ports: - "127.0.0.1:8536:8536" restart: always -- cgit v1.2.3