mirror of
https://github.com/LemmyNet/lemmy.git
synced 2025-02-02 23:31:41 +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>
131 lines
4.4 KiB
YAML
131 lines
4.4 KiB
YAML
x-logging: &default-logging
|
|
driver: "json-file"
|
|
options:
|
|
max-size: "50m"
|
|
max-file: "4"
|
|
|
|
services:
|
|
proxy:
|
|
image: nginx:1-alpine
|
|
ports:
|
|
# actual and only port facing any connection from outside
|
|
# Note, change the left number if port 1236 is already in use on your system
|
|
# You could use port 80 if you won't use a reverse proxy
|
|
- "1236:1236"
|
|
- "8536:8536"
|
|
volumes:
|
|
- ./nginx.conf:/etc/nginx/nginx.conf:ro,Z
|
|
restart: unless-stopped
|
|
depends_on:
|
|
- pictrs
|
|
- lemmy-ui
|
|
logging: *default-logging
|
|
|
|
lemmy:
|
|
# use "image" to pull down an already compiled lemmy. make sure to comment out "build".
|
|
# image: dessalines/lemmy:0.19.6
|
|
# platform: linux/x86_64 # no arm64 support. uncomment platform if using m1.
|
|
# use "build" to build your local lemmy server image for development. make sure to comment out "image".
|
|
# run: docker compose up --build
|
|
|
|
build:
|
|
context: ../
|
|
dockerfile: docker/Dockerfile
|
|
# args:
|
|
# RUST_RELEASE_MODE: release
|
|
# CARGO_BUILD_FEATURES: default
|
|
# this hostname is used in nginx reverse proxy and also for lemmy ui to connect to the backend, do not change
|
|
hostname: lemmy
|
|
restart: unless-stopped
|
|
environment:
|
|
- 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"
|
|
- RUST_BACKTRACE=full
|
|
ports:
|
|
# prometheus metrics can be enabled with the `prometheus` config option. they are available on
|
|
# port 10002, path /metrics by default
|
|
- "10002:10002"
|
|
volumes:
|
|
- ./lemmy.hjson:/config/config.hjson:Z
|
|
depends_on:
|
|
- postgres
|
|
- pictrs
|
|
logging: *default-logging
|
|
|
|
lemmy-ui:
|
|
# use "image" to pull down an already compiled lemmy-ui. make sure to comment out "build".
|
|
image: dessalines/lemmy-ui:0.19.8
|
|
# platform: linux/x86_64 # no arm64 support. uncomment platform if using m1.
|
|
# use "build" to build your local lemmy ui image for development. make sure to comment out "image".
|
|
# run: docker compose up --build
|
|
|
|
# build:
|
|
# context: ../../lemmy-ui # assuming lemmy-ui is cloned besides lemmy directory
|
|
# dockerfile: dev.dockerfile
|
|
environment:
|
|
# this needs to match the hostname defined in the lemmy service
|
|
- LEMMY_UI_LEMMY_INTERNAL_HOST=lemmy:8536
|
|
# set the outside hostname here
|
|
- LEMMY_UI_LEMMY_EXTERNAL_HOST=localhost:1236
|
|
- LEMMY_UI_HTTPS=false
|
|
- LEMMY_UI_DEBUG=true
|
|
depends_on:
|
|
- lemmy
|
|
restart: unless-stopped
|
|
logging: *default-logging
|
|
init: true
|
|
|
|
pictrs:
|
|
image: asonix/pictrs:0.5.16
|
|
# this needs to match the pictrs url in lemmy.hjson
|
|
hostname: pictrs
|
|
# we can set options to pictrs like this, here we set max. image size and forced format for conversion
|
|
# entrypoint: /sbin/tini -- /usr/local/bin/pict-rs -p /mnt -m 4 --image-format webp
|
|
environment:
|
|
- PICTRS_OPENTELEMETRY_URL=http://otel:4137
|
|
- PICTRS__API_KEY=API_KEY
|
|
- RUST_LOG=debug
|
|
- RUST_BACKTRACE=full
|
|
- PICTRS__MEDIA__VIDEO_CODEC=vp9
|
|
- PICTRS__MEDIA__GIF__MAX_WIDTH=256
|
|
- PICTRS__MEDIA__GIF__MAX_HEIGHT=256
|
|
- PICTRS__MEDIA__GIF__MAX_AREA=65536
|
|
- PICTRS__MEDIA__GIF__MAX_FRAME_COUNT=400
|
|
user: 991:991
|
|
volumes:
|
|
- ./volumes/pictrs:/mnt:Z
|
|
restart: unless-stopped
|
|
logging: *default-logging
|
|
|
|
postgres:
|
|
image: pgautoupgrade/pgautoupgrade:16-alpine
|
|
# this needs to match the database host in lemmy.hson
|
|
# Tune your settings via
|
|
# https://pgtune.leopard.in.ua/#/
|
|
# You can use this technique to add them here
|
|
# https://stackoverflow.com/a/30850095/1655478
|
|
hostname: postgres
|
|
command:
|
|
[
|
|
"postgres",
|
|
"-c",
|
|
"session_preload_libraries=auto_explain",
|
|
"-c",
|
|
"auto_explain.log_min_duration=5ms",
|
|
"-c",
|
|
"auto_explain.log_analyze=true",
|
|
"-c",
|
|
"auto_explain.log_triggers=true",
|
|
"-c",
|
|
"track_activity_query_size=1048576",
|
|
]
|
|
ports:
|
|
# use a different port so it doesn't conflict with potential postgres db running on the host
|
|
- "5433:5432"
|
|
environment:
|
|
- POSTGRES_USER=lemmy
|
|
- POSTGRES_PASSWORD=password
|
|
- POSTGRES_DB=lemmy
|
|
volumes:
|
|
- ./volumes/postgres:/var/lib/postgresql/data:Z
|
|
restart: unless-stopped
|
|
logging: *default-logging
|