LemmyNet
/
lemmy
3
2
Fork 3
Code Pull Requests 1 Releases Wiki Activity

Use pictrs instead of pictshare #47

Closed
nutomic wants to merge 0 commits from use-pictrs into master
pull from: use-pictrs
merge into: LemmyNet:master
Conversation 6 Commits - Files Changed - +94 -51
nutomic commented 2020-06-08 17:54:57 +00:00
Owner
Copy Link

Like I mentioned in the chat, for some reason nginx doesnt route uploads to pictrs, even though its the exact same config we used for pictshare.

Ansible should be good to go (only tested lemmy_dev.yml). The frontend will need more changes to handle the pictrs API properly.

Like I mentioned in the chat, for some reason nginx doesnt route uploads to pictrs, even though its the exact same config we used for pictshare. Ansible should be good to go (only tested lemmy_dev.yml). The frontend will need more changes to handle the pictrs API properly.
nutomic reviewed 2020-06-08 17:55:35 +00:00
ansible/ansible.cfg
@ -1,5 +1,6 @@
[defaults]
inventory=inventory
interpreter_python=/usr/bin/python3
nutomic commented 2020-06-08 17:55:35 +00:00
Author
Owner
Copy Link

This is needed to make it work on Ubuntu 20.04, but I think it breaks on 18.04.

This is needed to make it work on Ubuntu 20.04, but I think it breaks on 18.04.
nutomic reviewed 2020-06-08 17:57:46 +00:00
ansible/templates/docker-compose.yml
@ -28,2 +28,2 @@
pictshare:
image: hascheksolutions/pictshare:latest
pictrs:
image: asonix/pictrs:amd64-v0.1.0-r9
nutomic commented 2020-06-08 17:57:46 +00:00
Author
Owner
Copy Link

This isnt gonna work for ARM or other architectures.

This isnt gonna work for ARM or other architectures.
nutomic reviewed 2020-06-08 17:58:17 +00:00
ansible/templates/docker-compose.yml
@ -29,1 +28,3 @@
image: hascheksolutions/pictshare:latest
pictrs:
image: asonix/pictrs:amd64-v0.1.0-r9
user: 991:991
nutomic commented 2020-06-08 17:58:17 +00:00
Author
Owner
Copy Link

Asonix says this isnt needed, but in my tests it didnt work if I comment it out.

Asonix says this isnt needed, but in my tests it didnt work if I comment it out.
nutomic commented 2020-06-08 19:24:13 +00:00
Author
Owner
Copy Link

Should be fixed in the latest image version, need to update.

Should be fixed in the latest image version, need to update.
dessalines commented 2020-06-09 18:01:15 +00:00
Owner
Copy Link

I need to test this out on the front end to make sure it works, and I think we need to add some migration scripts to move all the pictures over.

Both a code one (in advanced migrations), that updates all the thumbnail and urls that contain pictshare to the new pictrs endpoint, and a manual one that moves all the pictures over to that folder.

I need to test this out on the front end to make sure it works, and I think we need to add some migration scripts to move all the pictures over. Both a code one (in advanced migrations), that updates all the thumbnail and urls that contain pictshare to the new pictrs endpoint, and a manual one that moves all the pictures over to that folder.
dessalines commented 2020-06-09 18:16:32 +00:00
Owner
Copy Link

I can't get this to work on the front end, were you able to?

I'm getting

nginx_1     | 2020/06/09 18:27:45 [error] 19#19: *1 writev() failed (32: Broken pipe) while sending request to upstream, client: 172.
24.0.1, server: 127.0.0.1, request: "POST /pictrs/image HTTP/1.1", upstream: "http://172.24.0.5:8080/image", host: "localhost", refer
rer: "http://localhost:8535/create_post"
I can't get this to work on the front end, were you able to? I'm getting ``` nginx_1 | 2020/06/09 18:27:45 [error] 19#19: *1 writev() failed (32: Broken pipe) while sending request to upstream, client: 172. 24.0.1, server: 127.0.0.1, request: "POST /pictrs/image HTTP/1.1", upstream: "http://172.24.0.5:8080/image", host: "localhost", refer rer: "http://localhost:8535/create_post" ```
dessalines commented 2020-06-09 21:18:49 +00:00
Owner
Copy Link

NM, I figured it out, btw I added a PR to yours from a branch I've been working on.

NM, I figured it out, btw I added a PR to yours from a branch I've been working on.
dessalines commented 2020-06-09 21:22:44 +00:00
Owner
Copy Link

BTW this also needs to fix the image thumbnailing currently in lib.rs

BTW this also needs to fix the image thumbnailing currently in `lib.rs`
nutomic commented 2020-06-09 21:40:10 +00:00
Author
Owner
Copy Link

Not a fan of making a PR for another PR lol. I didnt think of having to write a DB migration, thats annoying. But I can take care of the migration for image files no problem.

Not a fan of making a PR for another PR lol. I didnt think of having to write a DB migration, thats annoying. But I can take care of the migration for image files no problem.
👍 1
dessalines commented 2020-06-10 03:12:35 +00:00
Owner
Copy Link

I can do the code migration. It needs to be done because every image right now is stored in the DB as http://url/pictshare/hash, and needs to go to http://url/pictrs/image/hash.

I can do the code migration. It needs to be done because every image right now is stored in the DB as `http://url/pictshare/hash`, and needs to go to `http://url/pictrs/image/hash`.
nutomic closed this pull request 2020-06-11 13:33:58 +00:00

Pull request closed

Please reopen this pull request to perform a merge.
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: LemmyNet/lemmy#47
No description provided.
Delete Branch "use-pictrs"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?