mirror of
https://github.com/LemmyNet/lemmy.git
synced 2025-02-03 07:41:39 +00:00
52047459bb
* 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 commit89359dde4b. * 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 commit15f1671107. * 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>
157 lines
3.8 KiB
YAML
157 lines
3.8 KiB
YAML
version: "3.7"
|
|
|
|
x-ui-default: &ui-default
|
|
init: true
|
|
image: dessalines/lemmy-ui:0.19.6
|
|
# assuming lemmy-ui is cloned besides lemmy directory
|
|
# build:
|
|
# context: ../../../lemmy-ui
|
|
# dockerfile: dev.dockerfile
|
|
environment:
|
|
- LEMMY_UI_HTTPS=false
|
|
|
|
x-lemmy-default: &lemmy-default
|
|
build:
|
|
context: ../..
|
|
dockerfile: docker/Dockerfile
|
|
environment:
|
|
- RUST_BACKTRACE=1
|
|
- 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"
|
|
restart: always
|
|
|
|
x-postgres-default: &postgres-default
|
|
image: pgautoupgrade/pgautoupgrade:15-alpine
|
|
environment:
|
|
- POSTGRES_USER=lemmy
|
|
- POSTGRES_PASSWORD=password
|
|
- POSTGRES_DB=lemmy
|
|
restart: always
|
|
|
|
services:
|
|
nginx:
|
|
image: nginx:1-alpine
|
|
ports:
|
|
- "8540:8540"
|
|
- "8550:8550"
|
|
- "8560:8560"
|
|
- "8570:8570"
|
|
- "8580:8580"
|
|
volumes:
|
|
- ./nginx.conf:/etc/nginx/nginx.conf:Z
|
|
restart: always
|
|
depends_on:
|
|
- pictrs
|
|
- lemmy-alpha-ui
|
|
- lemmy-beta-ui
|
|
- lemmy-gamma-ui
|
|
- lemmy-delta-ui
|
|
- lemmy-epsilon-ui
|
|
|
|
pictrs:
|
|
restart: always
|
|
image: asonix/pictrs:0.5.16
|
|
user: 991:991
|
|
volumes:
|
|
- ./volumes/pictrs_alpha:/mnt:Z
|
|
|
|
lemmy-alpha-ui:
|
|
<<: *ui-default
|
|
environment:
|
|
- LEMMY_UI_LEMMY_INTERNAL_HOST=lemmy-alpha:8541
|
|
- LEMMY_UI_LEMMY_EXTERNAL_HOST=localhost:8541
|
|
depends_on:
|
|
- lemmy-alpha
|
|
lemmy-alpha:
|
|
<<: *lemmy-default
|
|
volumes:
|
|
- ./lemmy_alpha.hjson:/config/config.hjson:Z
|
|
depends_on:
|
|
- postgres_alpha
|
|
ports:
|
|
- "8541:8541"
|
|
postgres_alpha:
|
|
<<: *postgres-default
|
|
volumes:
|
|
- ./volumes/postgres_alpha:/var/lib/postgresql/data:Z
|
|
|
|
lemmy-beta-ui:
|
|
<<: *ui-default
|
|
environment:
|
|
- LEMMY_UI_LEMMY_INTERNAL_HOST=lemmy-beta:8551
|
|
- LEMMY_UI_LEMMY_EXTERNAL_HOST=localhost:8551
|
|
depends_on:
|
|
- lemmy-beta
|
|
lemmy-beta:
|
|
<<: *lemmy-default
|
|
volumes:
|
|
- ./lemmy_beta.hjson:/config/config.hjson:Z
|
|
depends_on:
|
|
- postgres_beta
|
|
ports:
|
|
- "8551:8551"
|
|
postgres_beta:
|
|
<<: *postgres-default
|
|
volumes:
|
|
- ./volumes/postgres_beta:/var/lib/postgresql/data:Z
|
|
|
|
lemmy-gamma-ui:
|
|
<<: *ui-default
|
|
environment:
|
|
- LEMMY_UI_LEMMY_INTERNAL_HOST=lemmy-gamma:8561
|
|
- LEMMY_UI_LEMMY_EXTERNAL_HOST=localhost:8561
|
|
depends_on:
|
|
- lemmy-gamma
|
|
lemmy-gamma:
|
|
<<: *lemmy-default
|
|
volumes:
|
|
- ./lemmy_gamma.hjson:/config/config.hjson:Z
|
|
depends_on:
|
|
- postgres_gamma
|
|
ports:
|
|
- "8561:8561"
|
|
postgres_gamma:
|
|
<<: *postgres-default
|
|
volumes:
|
|
- ./volumes/postgres_gamma:/var/lib/postgresql/data:Z
|
|
|
|
# An instance with only an allowlist for beta
|
|
lemmy-delta-ui:
|
|
<<: *ui-default
|
|
environment:
|
|
- LEMMY_UI_LEMMY_INTERNAL_HOST=lemmy-delta:8571
|
|
- LEMMY_UI_LEMMY_EXTERNAL_HOST=localhost:8571
|
|
depends_on:
|
|
- lemmy-delta
|
|
lemmy-delta:
|
|
<<: *lemmy-default
|
|
volumes:
|
|
- ./lemmy_delta.hjson:/config/config.hjson:Z
|
|
depends_on:
|
|
- postgres_delta
|
|
ports:
|
|
- "8571:8571"
|
|
postgres_delta:
|
|
<<: *postgres-default
|
|
volumes:
|
|
- ./volumes/postgres_delta:/var/lib/postgresql/data:Z
|
|
|
|
# An instance who has a blocklist, with lemmy-alpha blocked
|
|
lemmy-epsilon-ui:
|
|
<<: *ui-default
|
|
environment:
|
|
- LEMMY_UI_LEMMY_INTERNAL_HOST=lemmy-epsilon:8581
|
|
- LEMMY_UI_LEMMY_EXTERNAL_HOST=localhost:8581
|
|
depends_on:
|
|
- lemmy-epsilon
|
|
lemmy-epsilon:
|
|
<<: *lemmy-default
|
|
volumes:
|
|
- ./lemmy_epsilon.hjson:/config/config.hjson:Z
|
|
depends_on:
|
|
- postgres_epsilon
|
|
ports:
|
|
- "8581:8581"
|
|
postgres_epsilon:
|
|
<<: *postgres-default
|
|
volumes:
|
|
- ./volumes/postgres_epsilon:/var/lib/postgresql/data:Z
|