From e583e45d9a2221b3ed2a743cfa172abcd2a1d6a0 Mon Sep 17 00:00:00 2001 From: Felix Ableitner Date: Mon, 8 Jun 2020 19:52:32 +0200 Subject: Use pictrs instead of pictshare --- docker/dev/docker-compose.yml | 42 ++++++++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 18 deletions(-) (limited to 'docker/dev/docker-compose.yml') diff --git a/docker/dev/docker-compose.yml b/docker/dev/docker-compose.yml index 1702f66d..6c0624c4 100644 --- a/docker/dev/docker-compose.yml +++ b/docker/dev/docker-compose.yml @@ -1,22 +1,22 @@ version: '3.3' services: - postgres: - image: postgres:12-alpine - environment: - - POSTGRES_USER=lemmy - - POSTGRES_PASSWORD=password - - POSTGRES_DB=lemmy + nginx: + image: nginx:1.19-alpine + ports: + - "8536:8536" volumes: - - ./volumes/postgres:/var/lib/postgresql/data - restart: always + - ./nginx.conf:/etc/nginx/nginx.conf + depends_on: + - lemmy + - pictrs + - iframely + restart: "always" lemmy: build: context: ../../ dockerfile: docker/dev/Dockerfile - ports: - - "127.0.0.1:8536:8536" restart: always environment: - RUST_LOG=debug @@ -24,21 +24,27 @@ services: - ../lemmy.hjson:/config/config.hjson depends_on: - postgres - - pictshare - iframely - pictshare: - image: hascheksolutions/pictshare:latest - ports: - - "127.0.0.1:8537:80" + postgres: + image: postgres:12-alpine + environment: + - POSTGRES_USER=lemmy + - POSTGRES_PASSWORD=password + - POSTGRES_DB=lemmy volumes: - - ./volumes/pictshare:/usr/share/nginx/html/data + - ./volumes/postgres:/var/lib/postgresql/data + restart: always + + pictrs: + image: asonix/pictrs:amd64-v0.1.0-r9 + user: 991:991 + volumes: + - ./volumes/pictrs:/mnt restart: always iframely: image: dogbin/iframely:latest - ports: - - "127.0.0.1:8061:80" volumes: - ../iframely.config.local.js:/iframely/config.local.js:ro restart: always -- cgit v1.2.3 From bd26e4e9c1b146163ee839de0a45bb9354efd1f2 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Tue, 9 Jun 2020 17:17:24 -0400 Subject: Fixing some front end pictshare to pictrs conversions. --- docker/dev/docker-compose.yml | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) (limited to 'docker/dev/docker-compose.yml') diff --git a/docker/dev/docker-compose.yml b/docker/dev/docker-compose.yml index 6c0624c4..60b04beb 100644 --- a/docker/dev/docker-compose.yml +++ b/docker/dev/docker-compose.yml @@ -1,22 +1,13 @@ version: '3.3' services: - nginx: - image: nginx:1.19-alpine - ports: - - "8536:8536" - volumes: - - ./nginx.conf:/etc/nginx/nginx.conf - depends_on: - - lemmy - - pictrs - - iframely - restart: "always" lemmy: build: context: ../../ dockerfile: docker/dev/Dockerfile + ports: + - "127.0.0.1:8536:8536" restart: always environment: - RUST_LOG=debug @@ -37,7 +28,9 @@ services: restart: always pictrs: - image: asonix/pictrs:amd64-v0.1.0-r9 + image: asonix/pictrs:v0.1.0-r13 + ports: + - "127.0.0.1:8537:8080" user: 991:991 volumes: - ./volumes/pictrs:/mnt @@ -45,6 +38,8 @@ services: iframely: image: dogbin/iframely:latest + ports: + - "127.0.0.1:8061:80" volumes: - ../iframely.config.local.js:/iframely/config.local.js:ro restart: always -- cgit v1.2.3 From 4cf1f080bf113d6e30383eb1fddd37ce16025558 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Wed, 10 Jun 2020 22:47:06 -0400 Subject: Adding delete picture via pict-rs delete tokens. Fixes #505 --- docker/dev/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker/dev/docker-compose.yml') diff --git a/docker/dev/docker-compose.yml b/docker/dev/docker-compose.yml index 60b04beb..ab9ab7d8 100644 --- a/docker/dev/docker-compose.yml +++ b/docker/dev/docker-compose.yml @@ -28,7 +28,7 @@ services: restart: always pictrs: - image: asonix/pictrs:v0.1.0-r13 + image: asonix/pictrs:v0.1.3-r1 ports: - "127.0.0.1:8537:8080" user: 991:991 -- cgit v1.2.3 From cddc23494d5fd0f8098524299980a6dcbcb3fca3 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Fri, 12 Jun 2020 09:48:51 -0400 Subject: Upgrading pict-rs for working gifs. --- docker/dev/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker/dev/docker-compose.yml') diff --git a/docker/dev/docker-compose.yml b/docker/dev/docker-compose.yml index ab9ab7d8..2072024f 100644 --- a/docker/dev/docker-compose.yml +++ b/docker/dev/docker-compose.yml @@ -28,7 +28,7 @@ services: restart: always pictrs: - image: asonix/pictrs:v0.1.3-r1 + image: asonix/pictrs:v0.1.4-r0 ports: - "127.0.0.1:8537:8080" user: 991:991 -- cgit v1.2.3 From cb128256ed9b5779d696d3de599ef94bfe79a2e6 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Mon, 22 Jun 2020 08:31:15 -0400 Subject: Updating nginx.conf, upgrading pict-rs --- docker/dev/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker/dev/docker-compose.yml') diff --git a/docker/dev/docker-compose.yml b/docker/dev/docker-compose.yml index 2072024f..2575171e 100644 --- a/docker/dev/docker-compose.yml +++ b/docker/dev/docker-compose.yml @@ -28,7 +28,7 @@ services: restart: always pictrs: - image: asonix/pictrs:v0.1.4-r0 + image: asonix/pictrs:v0.1.13-r0 ports: - "127.0.0.1:8537:8080" user: 991:991 -- cgit v1.2.3 From 186e261fc023ceb57cae095668af0d9f92b6e48e Mon Sep 17 00:00:00 2001 From: Dessalines Date: Mon, 22 Jun 2020 12:53:39 -0400 Subject: Fixing docker-compose to rely on pictrs --- docker/dev/docker-compose.yml | 1 + 1 file changed, 1 insertion(+) (limited to 'docker/dev/docker-compose.yml') diff --git a/docker/dev/docker-compose.yml b/docker/dev/docker-compose.yml index 2575171e..bdcb4308 100644 --- a/docker/dev/docker-compose.yml +++ b/docker/dev/docker-compose.yml @@ -14,6 +14,7 @@ services: volumes: - ../lemmy.hjson:/config/config.hjson depends_on: + - pictrs - postgres - iframely -- cgit v1.2.3