nakidai
/
whoogle-search
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
whoogle-search/docker-compose.yml

44 lines
1.5 KiB
YAML
Raw Normal View History

Update docker-compose security features (#208) Co-authored-by: Sebastian Forst <sebastian.forst@posteo.de>
2021-02-26 18:33:11 +03:00
# cant use mem_limit in a 3.x docker-compose file in non swarm mode
# see https://github.com/docker/compose/issues/4513
version: "2.4"
Added docker-compose.yml
2020-05-10 22:59:37 +03:00
services:
whoogle-search:
image: benbusby/whoogle-search
container_name: whoogle-search
Remove duplicate docker-compose restart (#324)
2021-05-24 19:56:08 +03:00
restart: unless-stopped
Update docker-compose security features (#208) Co-authored-by: Sebastian Forst <sebastian.forst@posteo.de>
2021-02-26 18:33:11 +03:00
pids_limit: 50
mem_limit: 256mb
memswap_limit: 256mb
# user debian-tor from tor package
user: '102'
security_opt:
- no-new-privileges
cap_drop:
- ALL
read_only: true
tmpfs:
- /config/:size=10M,uid=102,gid=102,mode=1700
- /var/lib/tor/:size=10M,uid=102,gid=102,mode=1700
- /run/tor/:size=1M,uid=102,gid=102,mode=1700
Default to disabled environment vars, update readme Environment variables should by default be disabled, since they are optional and need further configuration by the user before enabling. Readme was updated to reflect this approach, as well as moving the documentation for the variables a bit lower and properly linking to them in other areas of the readme.
2020-11-04 01:28:43 +03:00
#environment: # Uncomment to configure environment variables
# Basic auth configuration, uncomment to enable
#- WHOOGLE_USER=<auth username>
#- WHOOGLE_PASS=<auth password>
# Proxy configuration, uncomment to enable
#- WHOOGLE_PROXY_USER=<proxy username>
#- WHOOGLE_PROXY_PASS=<proxy password>
Fix handling of http (vs https) proxy creation The requests library requires both 'http' and 'https' values in any included proxy dict, and whoogle was previously copying the http proxy to https for simplicity. The assumption was that if the underlying request wasn't able to connect via https, it would default to http (otherwise why have the requirement to specify both?) This led to connectivity issues for users with http only proxies as of the latest urllib and requests package versions, which are a lot more strict with connections over https. With the latest versions, if an https connection cannot be made, the library returns an error. As a result, the new proxy dict must look something like this for plain http proxies: {'http': 'http://domain.tld:port', 'https': 'http://domain.tld:port'} where both http and https are identical, but both are still required.
2021-06-04 22:30:21 +03:00
#- WHOOGLE_PROXY_TYPE=<proxy type (http|https|socks4|socks5)
Default to disabled environment vars, update readme Environment variables should by default be disabled, since they are optional and need further configuration by the user before enabling. Readme was updated to reflect this approach, as well as moving the documentation for the variables a bit lower and properly linking to them in other areas of the readme.
2020-11-04 01:28:43 +03:00
#- WHOOGLE_PROXY_LOC=<proxy host/ip>
Allow setting site alts using environment vars (#155) * Add ability to configure site alts w/ env vars Site alternatives (i.e. twitter.com -> nitter.net) can now be configured using environment variables: WHOOGLE_ALT_TW='nitter.net' # twitter alt WHOOGLE_ALT_YT='invidio.us' # youtube alt WHOOGLE_ALT_IG='bibliogram.art/u' # instagram alt Updated testing to confirm results have been modified. * Add site alt vars to docker settings and readme
2020-12-06 01:01:21 +03:00
# Site alternative configurations, uncomment to enable
# Note: If not set, the feature will still be available
# with default values.
#- WHOOGLE_ALT_TW=nitter.net
#- WHOOGLE_ALT_YT=invidious.snopyta.org
#- WHOOGLE_ALT_IG=bibliogram.art/u
Add ability to redirect reddit.com to libredd.it (#180) * Adds the ability to redirect reddit.com to libredd.it using the existing "site alts" config setting. This adds the WHOOGLE_ALT_RD environment variable for optionally redirecting reddit links to libreddit (https://github.com/spikecodes/libreddit). * Include libreddit in home page site alt note
2021-01-24 01:43:53 +03:00
#- WHOOGLE_ALT_RD=libredd.it
Add env_file option to docker-compose, refactor whoogle.env The env_file option is a better way of loading environment variables from whoogle.env, and has been added to docker-compose.yml. The whoogle.env file had comments after each example setting, and it was not clear that these comments needed to be removed when setting new values. The comments for each variable have been moved above the appropriate variable to reduce confusion. See #303 for initial discussion
2021-05-03 21:23:44 +03:00
#env_file: # Alternatively, load variables from whoogle.env
#- whoogle.env
Added docker-compose.yml
2020-05-10 22:59:37 +03:00
ports:
Swap out Flask's default web server for Waitress (#32) * Ignore venv when building docker file * Remove reference to 8888 port It wasn't really used anywhere, and setting it to 5000 everywhere removes ambiguity, and makes things easier to track and reason about * Use waitress rather than Flask's built in web server It's not production grade * Actually add waitress to requirements Woops!
2020-05-13 02:14:55 +03:00
- 5000:5000