From bcc88e4df895485574e8c8e8956e42e1141de437 Mon Sep 17 00:00:00 2001 From: Edwin Lyon Date: Mon, 10 Jun 2024 14:03:12 -0700 Subject: [PATCH] Update 'docker-compose.yml' --- docker-compose.yml | 78 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 61 insertions(+), 17 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 9a6f544..254bd34 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,24 @@ -version: "2.1" +version: "2.4" services: + mariadb: + image: linuxserver/mariadb:latest + container_name: mariadb + env_file: + - .env + environment: + - PUID=1000 + - PGID=1000 + - TZ=America/Los_Angeles + - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} + - MYSQL_DATABASE=${MYSQL_DATABASE} + - MYSQL_USER=${MYSQL_USER} + - MYSQL_PASSWORD=${MYSQL_PASSWORD} + volumes: + - mariadb:/config + networks: + - docker-network + restart: unless-stopped + bitwarden: image: vaultwarden/server:latest container_name: bitwarden_rs @@ -69,23 +88,48 @@ services: retries: 3 restart: unless-stopped - mariadb: - image: linuxserver/mariadb:latest - container_name: mariadb - env_file: - - .env + whoogle-search: + image: benbusby/whoogle-search:latest + container_name: whoogle-search + pids_limit: 50 + mem_limit: 256mb + memswap_limit: 256mb + user: whoogle + security_opt: + - no-new-privileges + cap_drop: + - ALL + tmpfs: + - /config/:size=10M,uid=927,gid=927,mode=1700 + - /var/lib/tor/:size=15M,uid=927,gid=927,mode=1700 + - /run/tor/:size=1M,uid=927,gid=927,mode=1700 environment: - - PUID=1000 - - PGID=1000 - - TZ=America/Los_Angeles - - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} - - MYSQL_DATABASE=${MYSQL_DATABASE} - - MYSQL_USER=${MYSQL_USER} - - MYSQL_PASSWORD=${MYSQL_PASSWORD} - volumes: - - mariadb:/config + - WHOOGLE_PROXY_TYPE=https + - WHOOGLE_CONFIG_DISABLE=0 + - WHOOGLE_CONFIG_THEME=system + - WHOOGLE_CONFIG_TOR=0 + - WHOOGLE_CONFIG_VIEW_IMAGE=1 + - WHOOGLE_CONFIG_COUNTRY=US + - WHOOGLE_CONFIG_LANGUAGE=lang_en + - WHOOGLE_CONFIG_SEARCH_LANGUAGE=lang_en + - WHOOGLE_CONFIG_URL=https://search.thelyoncompany.com + - WHOOGLE_RESULTS_PER_PAGE=30 + - WHOOGLE_AUTOCOMPLETE=1 + - WHOOGLE_CONFIG_ALTS=1 + - WHOOGLE_ALT_TW=farside.link/nitter + - WHOOGLE_ALT_YT=farside.link/invidious + - WHOOGLE_ALT_IG=farside.link/bibliogram/u + - WHOOGLE_ALT_RD=farside.link/libreddit + - WHOOGLE_ALT_MD=farside.link/scribe + - WHOOGLE_ALT_TL=farside.link/lingva + - WHOOGLE_ALT_IMG=farside.link/rimgo + - WHOOGLE_ALT_WIKI=farside.link/wikiless + - WHOOGLE_ALT_IMDB=farside.link/libremdb + - WHOOGLE_ALT_QUORA=farside.link/quetre networks: - docker-network + depends_on: + - swag restart: unless-stopped swag: @@ -99,9 +143,9 @@ services: - TZ=America/Los_Angeles - URL=thelyoncompany.com - EMAIL=edwin@thelyoncompany.com - - SUBDOMAINS=bitwarden,collabora,nextcloud + - SUBDOMAINS=bitwarden,collabora,nextcloud,search - ONLY_SUBDOMAINS=true - - EXTRA_DOMAINS=nextcloud.thelyoncompany.com,collabora.thelyoncompany.com,bitwarden.thelyoncompany.com + - EXTRA_DOMAINS=nextcloud.thelyoncompany.com,collabora.thelyoncompany.com,bitwarden.thelyoncompany.com,search.thelyoncompany.com - VALIDATION=dns - DNSPLUGIN=cloudflare volumes: