2023-06-22 08:22:15 +00:00
|
|
|
version: "3.7"
|
2019-12-27 17:25:07 +00:00
|
|
|
|
2023-06-13 12:37:06 +00:00
|
|
|
x-ui-default: &ui-default
|
2023-06-22 08:22:15 +00:00
|
|
|
init: true
|
2024-11-08 22:43:44 +00:00
|
|
|
image: dessalines/lemmy-ui:0.19.6
|
2023-06-13 12:37:06 +00:00
|
|
|
# assuming lemmy-ui is cloned besides lemmy directory
|
|
|
|
# build:
|
2023-09-20 13:14:51 +00:00
|
|
|
# context: ../../../lemmy-ui
|
|
|
|
# dockerfile: dev.dockerfile
|
2023-06-13 12:37:06 +00:00
|
|
|
environment:
|
|
|
|
- LEMMY_UI_HTTPS=false
|
|
|
|
|
|
|
|
x-lemmy-default: &lemmy-default
|
2023-09-20 13:14:51 +00:00
|
|
|
build:
|
|
|
|
context: ../..
|
|
|
|
dockerfile: docker/Dockerfile
|
2023-06-13 12:37:06 +00:00
|
|
|
environment:
|
|
|
|
- RUST_BACKTRACE=1
|
Search combined (#5271)
* Renaming person_mention to person_comment_mention.
* Finishing up post body mentions.
* Combined tables try 2
* Finishing up combined report table.
* Fix ts optionals.
* Adding tests, triggers, and history updates for report_combined.
* Adding profile.
* Add cursor pagination to report_combined view (#5244)
* add pagination cursor
* store timestamp instead of id in cursor (partial)
* Revert "store timestamp instead of id in cursor (partial)"
This reverts commit 89359dde4bc5fee39fdd2840828330f398444a36.
* use paginated query builder
* Fixing migration and paged API.
* Using dullbananas trigger procedure
* Removing pointless list routes, reorganizing tests.
* Fixing column XOR check.
* Forgot to remove list report actions.
* Cleanup.
* Use internal tagging.
* Fixing api tests.
* Adding a few indexes.
* Fixing migration name.
* Fixing unique constraints.
* Addressing PR comments.
* Start working on profile combined
* Adding views and replaceable schema.
* A few changes to profile view.
- Separating the profile fetch from its combined content fetch.
- Starting to separate saved_only into its own combined view.
* Finishing up combined person_saved and person_content.
* Fixing api tests.
* Moving to api-v4 routes.
* Fixing imports.
* Update crates/db_views/src/report_combined_view.rs
Co-authored-by: dullbananas <dull.bananas0@gmail.com>
* Update crates/db_views/src/report_combined_view.rs
Co-authored-by: dullbananas <dull.bananas0@gmail.com>
* Update crates/db_views/src/report_combined_view.rs
Co-authored-by: dullbananas <dull.bananas0@gmail.com>
* Update migrations/2024-12-02-181601_add_report_combined_table/up.sql
Co-authored-by: dullbananas <dull.bananas0@gmail.com>
* Update migrations/2024-12-02-181601_add_report_combined_table/up.sql
Co-authored-by: dullbananas <dull.bananas0@gmail.com>
* Fixing import and fmt.
* Fixing null types in postgres.
* Comment out err.
* Fixing TS issues.
* Adding types, fixing allow and blocklist crud.
* Starting to work on combined views.
* Using dullbananas trigger procedure
* Adding the full combined view queries.
* Adding tests.
* taplo fmt.
* Upgrading package.json deps.
* Updating pnpm
* Most of the bulk work done, need to add tests yet.
* Finishing up inbox.
* Using assert_length
* Fixing sql_format.
* Running fmt.
* Fixing cargo shear.
* Fixing clippy.
* Addressing PR comments.
* Starting to work on search combined.
* Fix
* Removing serialization
* Removing serialization
* Moving db_views_actor and _moderator into db_views.
- This is necessary because the combined views use both, and that
separation was arbitrary to begin with. db_schema has no such crate
separation.
* Adding search combined view, need to write tests yet.
* Filters done, working on tests.
* Adding tests for person, post, and community.
* Finishing up tests.
* Fixing duped trigger.
* Remove saved_only test.
* Remove pointless post_tags types.
* Remove pointless index.
* Changing published to saved for person_saved_combined.
* Removing comment.
* Renaming modlog when_ columns to published.
- Fixes #5312
* Adding strum and simplifying imports.
* Avoiding clone in map_to_enum
* Changing modded_person to other_person.
* Update crates/db_views_moderator/src/modlog_combined_view.rs
Co-authored-by: dullbananas <dull.bananas0@gmail.com>
* Update crates/db_views_moderator/src/modlog_combined_view.rs
Co-authored-by: dullbananas <dull.bananas0@gmail.com>
* Update crates/db_views_moderator/src/modlog_combined_view.rs
Co-authored-by: dullbananas <dull.bananas0@gmail.com>
* Addressing PR comments.
* Fixing split.
* Revert "Adding strum and simplifying imports."
This reverts commit 15f167110721429dd6e465f522250c8beb3d4dd7.
* Running fmt.
* Using assert + matches instead of filter_map.
* Adding listPersonContent check.
* Updating lemmy-js-client
* Fixing mark all as read route, changing mark read to SuccessResponse.
* Adding post body mention api test, fixing api tests.
* Fixing route locations, and api tests.
* Formatting sql.
* Formatting sql 2.
* Fixing search result, running clippy.
* Fixing ts_option.
* Adding search_combined.score column, and DB triggers.
* Fixing API tests.
* Adding an index for score.
* Update crates/db_schema/src/newtypes.rs
Co-authored-by: dullbananas <dull.bananas0@gmail.com>
* Avoiding inner joins for up.sql
* Adding person_aggregates.published column.
---------
Co-authored-by: dullbananas <dull.bananas0@gmail.com>
2025-01-28 03:58:19 +00:00
|
|
|
- RUST_LOG="warn,lemmy_server=debug,lemmy_api=debug,lemmy_api_common=debug,lemmy_api_crud=debug,lemmy_apub=debug,lemmy_db_schema=debug,lemmy_db_views=debug,lemmy_routes=debug,lemmy_utils=debug,lemmy_websocket=debug"
|
2023-06-13 12:37:06 +00:00
|
|
|
restart: always
|
|
|
|
|
|
|
|
x-postgres-default: &postgres-default
|
2024-07-31 22:54:44 +00:00
|
|
|
image: pgautoupgrade/pgautoupgrade:15-alpine
|
2023-06-13 12:37:06 +00:00
|
|
|
environment:
|
|
|
|
- POSTGRES_USER=lemmy
|
|
|
|
- POSTGRES_PASSWORD=password
|
|
|
|
- POSTGRES_DB=lemmy
|
|
|
|
restart: always
|
|
|
|
|
2019-12-27 17:25:07 +00:00
|
|
|
services:
|
2020-03-28 16:30:59 +00:00
|
|
|
nginx:
|
2021-09-02 11:50:20 +00:00
|
|
|
image: nginx:1-alpine
|
2020-03-28 16:30:59 +00:00
|
|
|
ports:
|
|
|
|
- "8540:8540"
|
|
|
|
- "8550:8550"
|
2020-06-03 21:55:32 +00:00
|
|
|
- "8560:8560"
|
2020-08-20 12:44:22 +00:00
|
|
|
- "8570:8570"
|
|
|
|
- "8580:8580"
|
2020-03-28 16:30:59 +00:00
|
|
|
volumes:
|
2023-05-12 00:15:12 +00:00
|
|
|
- ./nginx.conf:/etc/nginx/nginx.conf:Z
|
2021-09-17 15:44:20 +00:00
|
|
|
restart: always
|
2020-03-28 16:30:59 +00:00
|
|
|
depends_on:
|
2020-07-01 12:54:29 +00:00
|
|
|
- pictrs
|
2020-09-24 13:50:38 +00:00
|
|
|
- lemmy-alpha-ui
|
|
|
|
- lemmy-beta-ui
|
|
|
|
- lemmy-gamma-ui
|
|
|
|
- lemmy-delta-ui
|
|
|
|
- lemmy-epsilon-ui
|
2020-03-28 16:30:59 +00:00
|
|
|
|
2020-07-01 12:54:29 +00:00
|
|
|
pictrs:
|
|
|
|
restart: always
|
2024-06-15 10:53:11 +00:00
|
|
|
image: asonix/pictrs:0.5.16
|
2020-07-01 12:54:29 +00:00
|
|
|
user: 991:991
|
|
|
|
volumes:
|
2023-05-12 00:15:12 +00:00
|
|
|
- ./volumes/pictrs_alpha:/mnt:Z
|
2020-07-01 12:54:29 +00:00
|
|
|
|
2020-09-15 19:26:47 +00:00
|
|
|
lemmy-alpha-ui:
|
2023-06-13 12:37:06 +00:00
|
|
|
<<: *ui-default
|
2020-09-15 19:26:47 +00:00
|
|
|
environment:
|
2023-02-05 17:30:10 +00:00
|
|
|
- LEMMY_UI_LEMMY_INTERNAL_HOST=lemmy-alpha:8541
|
|
|
|
- LEMMY_UI_LEMMY_EXTERNAL_HOST=localhost:8541
|
2020-09-15 19:26:47 +00:00
|
|
|
depends_on:
|
|
|
|
- lemmy-alpha
|
2020-07-01 12:54:29 +00:00
|
|
|
lemmy-alpha:
|
2023-06-13 12:37:06 +00:00
|
|
|
<<: *lemmy-default
|
2021-03-01 17:24:11 +00:00
|
|
|
volumes:
|
2023-05-12 00:15:12 +00:00
|
|
|
- ./lemmy_alpha.hjson:/config/config.hjson:Z
|
2019-12-27 17:25:07 +00:00
|
|
|
depends_on:
|
2020-02-29 02:11:39 +00:00
|
|
|
- postgres_alpha
|
2023-05-12 00:15:12 +00:00
|
|
|
ports:
|
2020-09-15 19:26:47 +00:00
|
|
|
- "8541:8541"
|
2020-02-29 02:11:39 +00:00
|
|
|
postgres_alpha:
|
2023-06-13 12:37:06 +00:00
|
|
|
<<: *postgres-default
|
2020-01-02 23:28:43 +00:00
|
|
|
volumes:
|
2023-05-12 00:15:12 +00:00
|
|
|
- ./volumes/postgres_alpha:/var/lib/postgresql/data:Z
|
2019-12-27 17:25:07 +00:00
|
|
|
|
2020-09-15 19:26:47 +00:00
|
|
|
lemmy-beta-ui:
|
2023-06-13 12:37:06 +00:00
|
|
|
<<: *ui-default
|
2020-09-15 19:26:47 +00:00
|
|
|
environment:
|
2023-02-05 17:30:10 +00:00
|
|
|
- LEMMY_UI_LEMMY_INTERNAL_HOST=lemmy-beta:8551
|
|
|
|
- LEMMY_UI_LEMMY_EXTERNAL_HOST=localhost:8551
|
2020-09-15 19:26:47 +00:00
|
|
|
depends_on:
|
|
|
|
- lemmy-beta
|
2020-07-01 12:54:29 +00:00
|
|
|
lemmy-beta:
|
2023-06-13 12:37:06 +00:00
|
|
|
<<: *lemmy-default
|
2021-03-01 17:24:11 +00:00
|
|
|
volumes:
|
2023-05-12 00:15:12 +00:00
|
|
|
- ./lemmy_beta.hjson:/config/config.hjson:Z
|
2019-12-27 17:25:07 +00:00
|
|
|
depends_on:
|
2020-02-29 02:11:39 +00:00
|
|
|
- postgres_beta
|
2023-05-12 00:15:12 +00:00
|
|
|
ports:
|
2020-09-15 19:26:47 +00:00
|
|
|
- "8551:8551"
|
2020-02-29 02:11:39 +00:00
|
|
|
postgres_beta:
|
2023-06-13 12:37:06 +00:00
|
|
|
<<: *postgres-default
|
2019-12-27 17:25:07 +00:00
|
|
|
volumes:
|
2023-05-12 00:15:12 +00:00
|
|
|
- ./volumes/postgres_beta:/var/lib/postgresql/data:Z
|
2020-03-14 00:05:42 +00:00
|
|
|
|
2020-09-15 19:26:47 +00:00
|
|
|
lemmy-gamma-ui:
|
2023-06-13 12:37:06 +00:00
|
|
|
<<: *ui-default
|
2020-09-15 19:26:47 +00:00
|
|
|
environment:
|
2023-02-05 17:30:10 +00:00
|
|
|
- LEMMY_UI_LEMMY_INTERNAL_HOST=lemmy-gamma:8561
|
|
|
|
- LEMMY_UI_LEMMY_EXTERNAL_HOST=localhost:8561
|
2020-09-15 19:26:47 +00:00
|
|
|
depends_on:
|
|
|
|
- lemmy-gamma
|
2020-07-01 12:54:29 +00:00
|
|
|
lemmy-gamma:
|
2023-06-13 12:37:06 +00:00
|
|
|
<<: *lemmy-default
|
2021-03-01 17:24:11 +00:00
|
|
|
volumes:
|
2023-05-12 00:15:12 +00:00
|
|
|
- ./lemmy_gamma.hjson:/config/config.hjson:Z
|
2020-06-03 21:55:32 +00:00
|
|
|
depends_on:
|
|
|
|
- postgres_gamma
|
2023-05-12 00:15:12 +00:00
|
|
|
ports:
|
2020-09-15 19:26:47 +00:00
|
|
|
- "8561:8561"
|
2020-06-03 21:55:32 +00:00
|
|
|
postgres_gamma:
|
2023-06-13 12:37:06 +00:00
|
|
|
<<: *postgres-default
|
2020-06-03 21:55:32 +00:00
|
|
|
volumes:
|
2023-05-12 00:15:12 +00:00
|
|
|
- ./volumes/postgres_gamma:/var/lib/postgresql/data:Z
|
2020-06-03 21:55:32 +00:00
|
|
|
|
2020-08-20 12:44:22 +00:00
|
|
|
# An instance with only an allowlist for beta
|
2020-09-15 19:26:47 +00:00
|
|
|
lemmy-delta-ui:
|
2023-06-13 12:37:06 +00:00
|
|
|
<<: *ui-default
|
2020-09-15 19:26:47 +00:00
|
|
|
environment:
|
2023-02-05 17:30:10 +00:00
|
|
|
- LEMMY_UI_LEMMY_INTERNAL_HOST=lemmy-delta:8571
|
|
|
|
- LEMMY_UI_LEMMY_EXTERNAL_HOST=localhost:8571
|
2020-09-15 19:26:47 +00:00
|
|
|
depends_on:
|
|
|
|
- lemmy-delta
|
2020-08-20 12:44:22 +00:00
|
|
|
lemmy-delta:
|
2023-06-13 12:37:06 +00:00
|
|
|
<<: *lemmy-default
|
2021-03-01 17:24:11 +00:00
|
|
|
volumes:
|
2023-05-12 00:15:12 +00:00
|
|
|
- ./lemmy_delta.hjson:/config/config.hjson:Z
|
2020-08-20 12:44:22 +00:00
|
|
|
depends_on:
|
|
|
|
- postgres_delta
|
2023-05-12 00:15:12 +00:00
|
|
|
ports:
|
2020-09-15 19:26:47 +00:00
|
|
|
- "8571:8571"
|
2020-08-20 12:44:22 +00:00
|
|
|
postgres_delta:
|
2023-06-13 12:37:06 +00:00
|
|
|
<<: *postgres-default
|
2020-08-20 12:44:22 +00:00
|
|
|
volumes:
|
2023-05-12 00:15:12 +00:00
|
|
|
- ./volumes/postgres_delta:/var/lib/postgresql/data:Z
|
2020-08-20 12:44:22 +00:00
|
|
|
|
|
|
|
# An instance who has a blocklist, with lemmy-alpha blocked
|
2020-09-15 19:26:47 +00:00
|
|
|
lemmy-epsilon-ui:
|
2023-06-13 12:37:06 +00:00
|
|
|
<<: *ui-default
|
2020-09-15 19:26:47 +00:00
|
|
|
environment:
|
2023-02-05 17:30:10 +00:00
|
|
|
- LEMMY_UI_LEMMY_INTERNAL_HOST=lemmy-epsilon:8581
|
|
|
|
- LEMMY_UI_LEMMY_EXTERNAL_HOST=localhost:8581
|
2020-09-15 19:26:47 +00:00
|
|
|
depends_on:
|
|
|
|
- lemmy-epsilon
|
2020-08-20 12:44:22 +00:00
|
|
|
lemmy-epsilon:
|
2023-06-13 12:37:06 +00:00
|
|
|
<<: *lemmy-default
|
2021-03-01 17:24:11 +00:00
|
|
|
volumes:
|
2023-05-12 00:15:12 +00:00
|
|
|
- ./lemmy_epsilon.hjson:/config/config.hjson:Z
|
2020-08-20 12:44:22 +00:00
|
|
|
depends_on:
|
|
|
|
- postgres_epsilon
|
2023-05-12 00:15:12 +00:00
|
|
|
ports:
|
2020-09-15 19:26:47 +00:00
|
|
|
- "8581:8581"
|
2020-08-20 12:44:22 +00:00
|
|
|
postgres_epsilon:
|
2023-06-13 12:37:06 +00:00
|
|
|
<<: *postgres-default
|
2020-08-20 12:44:22 +00:00
|
|
|
volumes:
|
2023-05-12 00:15:12 +00:00
|
|
|
- ./volumes/postgres_epsilon:/var/lib/postgresql/data:Z
|