From c32585b03429f0f76d1e4ff738786321a0a9df98 Mon Sep 17 00:00:00 2001 From: Edgar Alvarado <15692727+pe1uca@users.noreply.github.com> Date: Tue, 13 Jun 2023 08:37:06 -0400 Subject: [PATCH] Docker yaml anchors and docker logs (#3027) * Use anchor for duplicated compose properties * Include docker log max * Run prettier --- docker/docker-compose.yml | 11 +++ docker/federation/docker-compose.yml | 104 ++++++++++----------------- 2 files changed, 50 insertions(+), 65 deletions(-) diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 1b7d85eb..b3b3b8b3 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -1,5 +1,11 @@ version: "3.3" +x-logging: &default-logging + driver: "json-file" + options: + max-size: "50m" + max-file: 4 + networks: # communication to web and clients lemmyexternalproxy: @@ -26,6 +32,7 @@ services: depends_on: - pictrs - lemmy-ui + logging: *default-logging lemmy: # image: dessalines/lemmy:dev @@ -50,6 +57,7 @@ services: depends_on: - postgres - pictrs + logging: *default-logging lemmy-ui: image: dessalines/lemmy-ui:0.17.1 @@ -71,6 +79,7 @@ services: depends_on: - lemmy restart: always + logging: *default-logging pictrs: image: asonix/pictrs:0.4.0-beta.19 @@ -94,6 +103,7 @@ services: volumes: - ./volumes/pictrs:/mnt:Z restart: always + logging: *default-logging postgres: image: postgres:15-alpine @@ -129,3 +139,4 @@ services: volumes: - ./volumes/postgres:/var/lib/postgresql/data:Z restart: always + logging: *default-logging diff --git a/docker/federation/docker-compose.yml b/docker/federation/docker-compose.yml index dba64b1b..49049e08 100644 --- a/docker/federation/docker-compose.yml +++ b/docker/federation/docker-compose.yml @@ -1,5 +1,29 @@ version: "3.3" +x-ui-default: &ui-default + image: dessalines/lemmy-ui:0.17.3 + # 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 + image: lemmy-federation:latest + 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_db_views_actor=debug,lemmy_db_views_moderator=debug,lemmy_routes=debug,lemmy_utils=debug,lemmy_websocket=debug" + restart: always + +x-postgres-default: &postgres-default + image: postgres:15-alpine + environment: + - POSTGRES_USER=lemmy + - POSTGRES_PASSWORD=password + - POSTGRES_DB=lemmy + restart: always + services: nginx: image: nginx:1-alpine @@ -28,153 +52,103 @@ services: - ./volumes/pictrs_alpha:/mnt:Z lemmy-alpha-ui: - image: dessalines/lemmy-ui:0.17.1 + <<: *ui-default environment: - LEMMY_UI_LEMMY_INTERNAL_HOST=lemmy-alpha:8541 - LEMMY_UI_LEMMY_EXTERNAL_HOST=localhost:8541 - - LEMMY_UI_HTTPS=false depends_on: - lemmy-alpha lemmy-alpha: - image: lemmy-federation:latest + <<: *lemmy-default volumes: - ./lemmy_alpha.hjson:/config/config.hjson:Z - 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_db_views_actor=debug,lemmy_db_views_moderator=debug,lemmy_routes=debug,lemmy_utils=debug,lemmy_websocket=debug" depends_on: - postgres_alpha - restart: always ports: - "8541:8541" postgres_alpha: - image: postgres:15-alpine - environment: - - POSTGRES_USER=lemmy - - POSTGRES_PASSWORD=password - - POSTGRES_DB=lemmy - restart: always + <<: *postgres-default volumes: - ./volumes/postgres_alpha:/var/lib/postgresql/data:Z lemmy-beta-ui: - image: dessalines/lemmy-ui:0.17.1 + <<: *ui-default environment: - LEMMY_UI_LEMMY_INTERNAL_HOST=lemmy-beta:8551 - LEMMY_UI_LEMMY_EXTERNAL_HOST=localhost:8551 - - LEMMY_UI_HTTPS=false depends_on: - lemmy-beta lemmy-beta: - image: lemmy-federation:latest + <<: *lemmy-default volumes: - ./lemmy_beta.hjson:/config/config.hjson:Z - 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_db_views_actor=debug,lemmy_db_views_moderator=debug,lemmy_routes=debug,lemmy_utils=debug,lemmy_websocket=debug" depends_on: - postgres_beta - restart: always ports: - "8551:8551" postgres_beta: - image: postgres:15-alpine - environment: - - POSTGRES_USER=lemmy - - POSTGRES_PASSWORD=password - - POSTGRES_DB=lemmy - restart: always + <<: *postgres-default volumes: - ./volumes/postgres_beta:/var/lib/postgresql/data:Z lemmy-gamma-ui: - image: dessalines/lemmy-ui:0.17.1 + <<: *ui-default environment: - LEMMY_UI_LEMMY_INTERNAL_HOST=lemmy-gamma:8561 - LEMMY_UI_LEMMY_EXTERNAL_HOST=localhost:8561 - - LEMMY_UI_HTTPS=false depends_on: - lemmy-gamma lemmy-gamma: - image: lemmy-federation:latest + <<: *lemmy-default volumes: - ./lemmy_gamma.hjson:/config/config.hjson:Z - 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_db_views_actor=debug,lemmy_db_views_moderator=debug,lemmy_routes=debug,lemmy_utils=debug,lemmy_websocket=debug" depends_on: - postgres_gamma - restart: always ports: - "8561:8561" postgres_gamma: - image: postgres:15-alpine - environment: - - POSTGRES_USER=lemmy - - POSTGRES_PASSWORD=password - - POSTGRES_DB=lemmy - restart: always + <<: *postgres-default volumes: - ./volumes/postgres_gamma:/var/lib/postgresql/data:Z # An instance with only an allowlist for beta lemmy-delta-ui: - image: dessalines/lemmy-ui:0.17.1 + <<: *ui-default environment: - LEMMY_UI_LEMMY_INTERNAL_HOST=lemmy-delta:8571 - LEMMY_UI_LEMMY_EXTERNAL_HOST=localhost:8571 - - LEMMY_UI_HTTPS=false depends_on: - lemmy-delta lemmy-delta: - image: lemmy-federation:latest + <<: *lemmy-default volumes: - ./lemmy_delta.hjson:/config/config.hjson:Z - 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_db_views_actor=debug,lemmy_db_views_moderator=debug,lemmy_routes=debug,lemmy_utils=debug,lemmy_websocket=debug" depends_on: - postgres_delta - restart: always ports: - "8571:8571" postgres_delta: - image: postgres:15-alpine - environment: - - POSTGRES_USER=lemmy - - POSTGRES_PASSWORD=password - - POSTGRES_DB=lemmy - restart: always + <<: *postgres-default volumes: - ./volumes/postgres_delta:/var/lib/postgresql/data:Z # An instance who has a blocklist, with lemmy-alpha blocked lemmy-epsilon-ui: - image: dessalines/lemmy-ui:0.17.1 + <<: *ui-default environment: - LEMMY_UI_LEMMY_INTERNAL_HOST=lemmy-epsilon:8581 - LEMMY_UI_LEMMY_EXTERNAL_HOST=localhost:8581 - - LEMMY_UI_HTTPS=false depends_on: - lemmy-epsilon lemmy-epsilon: - image: lemmy-federation:latest + <<: *lemmy-default volumes: - ./lemmy_epsilon.hjson:/config/config.hjson:Z - 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_db_views_actor=debug,lemmy_db_views_moderator=debug,lemmy_routes=debug,lemmy_utils=debug,lemmy_websocket=debug" depends_on: - postgres_epsilon - restart: always ports: - "8581:8581" postgres_epsilon: - image: postgres:15-alpine - environment: - - POSTGRES_USER=lemmy - - POSTGRES_PASSWORD=password - - POSTGRES_DB=lemmy - restart: always + <<: *postgres-default volumes: - ./volumes/postgres_epsilon:/var/lib/postgresql/data:Z -- 2.44.1