From 6fdb3118112ec9a42bffe1cde8cf725041f966cb Mon Sep 17 00:00:00 2001 From: Madeorsk Date: Sat, 30 Dec 2023 00:25:00 +0100 Subject: [PATCH] Custom configuration for rudeshark.net --- docker-compose.yml | 58 +++++++++++++++++++++++++--------------------- 1 file changed, 32 insertions(+), 26 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index e40751300..86211f0e5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,19 +2,20 @@ version: "3" services: web: - image: registry.joinfirefish.org/firefish/firefish - container_name: firefish_web + # Choose one of these tags: + # stable-amd64, stable-arm64, beta-amd64, beta-arm64 + image: registry.joinfirefish.org/firefish/firefish:beta-amd64 + container_name: rudeshark_web restart: unless-stopped depends_on: - db - redis -### Uncomment one of the following to use a search engine -# - meilisearch + - meilisearch # - sonic ports: - - "3000:3000" + - "127.0.0.1:8071:3000" networks: - - calcnet + - firenet # - web environment: NODE_ENV: production @@ -24,39 +25,41 @@ services: redis: restart: unless-stopped - image: docker.io/redis:7.0-alpine - container_name: firefish_redis + image: docker.io/redis:7-alpine + container_name: rudeshark_redis networks: - - calcnet + - firenet volumes: - ./redis:/data db: restart: unless-stopped - image: docker.io/postgres:12.2-alpine - container_name: firefish_db + image: docker.io/postgres:15-alpine + container_name: rudeshark_db networks: - - calcnet + - firenet env_file: - .config/docker.env volumes: - - ./db:/var/lib/postgresql/data + - ./postgresql:/var/lib/postgresql/data ### Only one of the below should be used. ### Meilisearch is better overall, but resource-intensive. Sonic is a very light full text search engine. -# meilisearch: -# container_name: meilisearch -# image: getmeili/meilisearch:v1.1.1 -# environment: -# - MEILI_ENV=${MEILI_ENV:-development} + meilisearch: + container_name: rudeshark_meilisearch + image: getmeili/meilisearch:v1.1.1 + environment: + - MEILI_ENV=production + env_file: + - ./.config/meilisearch.env # ports: -# - "7700:7700" -# networks: -# - calcnet -# volumes: -# - ./meili_data:/meili_data -# restart: unless-stopped +# - "127.0.0.1:7706:7700" + networks: + - firenet + volumes: + - ./meilisearch/data:/meili_data + restart: unless-stopped # sonic: # restart: unless-stopped @@ -64,13 +67,16 @@ services: # logging: # driver: none # networks: -# - calcnet +# - firenet # volumes: # - ./sonic:/var/lib/sonic/store # - ./sonic/config.cfg:/etc/sonic.cfg networks: - calcnet: + firenet: + ipam: + config: + - subnet: 172.22.22.0/24 # web: # external: # name: web