mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-11-25 15:39:11 +00:00
Remove networks from docker-compose.yml (#3356)
This commit is contained in:
parent
c9e9ff46fa
commit
8fbc630ce1
|
@ -6,20 +6,9 @@ x-logging: &default-logging
|
||||||
max-size: "50m"
|
max-size: "50m"
|
||||||
max-file: 4
|
max-file: 4
|
||||||
|
|
||||||
networks:
|
|
||||||
# communication to web and clients
|
|
||||||
lemmyexternalproxy:
|
|
||||||
# communication between lemmy services
|
|
||||||
lemmyinternal:
|
|
||||||
driver: bridge
|
|
||||||
internal: true
|
|
||||||
|
|
||||||
services:
|
services:
|
||||||
proxy:
|
proxy:
|
||||||
image: nginx:1-alpine
|
image: nginx:1-alpine
|
||||||
networks:
|
|
||||||
- lemmyinternal
|
|
||||||
- lemmyexternalproxy
|
|
||||||
ports:
|
ports:
|
||||||
# actual and only port facing any connection from outside
|
# actual and only port facing any connection from outside
|
||||||
# Note, change the left number if port 1236 is already in use on your system
|
# Note, change the left number if port 1236 is already in use on your system
|
||||||
|
@ -45,9 +34,6 @@ services:
|
||||||
# RUST_RELEASE_MODE: release
|
# RUST_RELEASE_MODE: release
|
||||||
# this hostname is used in nginx reverse proxy and also for lemmy ui to connect to the backend, do not change
|
# this hostname is used in nginx reverse proxy and also for lemmy ui to connect to the backend, do not change
|
||||||
hostname: lemmy
|
hostname: lemmy
|
||||||
networks:
|
|
||||||
- lemmyinternal
|
|
||||||
- lemmyexternalproxy
|
|
||||||
restart: always
|
restart: always
|
||||||
environment:
|
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_db_views_actor=debug,lemmy_db_views_moderator=debug,lemmy_routes=debug,lemmy_utils=debug,lemmy_websocket=debug"
|
- 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_db_views_actor=debug,lemmy_db_views_moderator=debug,lemmy_routes=debug,lemmy_utils=debug,lemmy_websocket=debug"
|
||||||
|
@ -67,8 +53,6 @@ services:
|
||||||
# build:
|
# build:
|
||||||
# context: ../../lemmy-ui
|
# context: ../../lemmy-ui
|
||||||
# dockerfile: dev.dockerfile
|
# dockerfile: dev.dockerfile
|
||||||
networks:
|
|
||||||
- lemmyinternal
|
|
||||||
environment:
|
environment:
|
||||||
# this needs to match the hostname defined in the lemmy service
|
# this needs to match the hostname defined in the lemmy service
|
||||||
- LEMMY_UI_LEMMY_INTERNAL_HOST=lemmy:8536
|
- LEMMY_UI_LEMMY_INTERNAL_HOST=lemmy:8536
|
||||||
|
@ -88,8 +72,6 @@ services:
|
||||||
hostname: pictrs
|
hostname: pictrs
|
||||||
# we can set options to pictrs like this, here we set max. image size and forced format for conversion
|
# 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
|
# entrypoint: /sbin/tini -- /usr/local/bin/pict-rs -p /mnt -m 4 --image-format webp
|
||||||
networks:
|
|
||||||
- lemmyinternal
|
|
||||||
environment:
|
environment:
|
||||||
- PICTRS_OPENTELEMETRY_URL=http://otel:4137
|
- PICTRS_OPENTELEMETRY_URL=http://otel:4137
|
||||||
- PICTRS__API_KEY=API_KEY
|
- PICTRS__API_KEY=API_KEY
|
||||||
|
@ -126,10 +108,6 @@ services:
|
||||||
"-c",
|
"-c",
|
||||||
"track_activity_query_size=1048576",
|
"track_activity_query_size=1048576",
|
||||||
]
|
]
|
||||||
networks:
|
|
||||||
- lemmyinternal
|
|
||||||
# adding the external facing network to allow direct db access for devs
|
|
||||||
- lemmyexternalproxy
|
|
||||||
ports:
|
ports:
|
||||||
# use a different port so it doesnt conflict with potential postgres db running on the host
|
# use a different port so it doesnt conflict with potential postgres db running on the host
|
||||||
- "5433:5432"
|
- "5433:5432"
|
||||||
|
|
Loading…
Reference in a new issue