Archives/whoogle-search
2
0
Fork 0
mirror of https://github.com/benbusby/whoogle-search synced 2024-10-30 09:20:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
788730cdc2
whoogle-search/Dockerfile

92 lines
2.3 KiB
Docker
Raw Normal View History

Upgrade Python image in Dockerfile (#669) Vulnerable Python image upgraded to python:3.11.0a5-alpine
2022-02-23 16:33:46 +00:00
FROM python:3.11.0a5-alpine as builder
Added basic docker setup
2020-04-08 20:05:28 +00:00
Use alpine docker image (#573)
2021-12-19 18:59:06 +00:00
RUN apk --update add \
build-base \
Add docker buildx gh action This automatically builds and pushes a cross platform image to Docker Hub.
2021-01-05 22:53:58 +00:00
libxml2-dev \
libxslt-dev \
Use alpine docker image (#573)
2021-12-19 18:59:06 +00:00
openssl-dev \
Use multi-stage container build (#210) This only adds necessary packages and files from the repo to reduce the image size. Co-authored-by: pred2k <does@not.exists>
2021-02-26 15:49:40 +00:00
libffi-dev
docker: Upgrade pip before installing requirements Outdated pip versions require a rust compiler to install the cryptography package. Ensuring that pip is up to date should eliminate the recent buildx errors where a prebuilt cryptography wheel is not available.
2021-12-21 21:26:01 +00:00
Improved Dockerfile
2020-05-10 12:00:22 +00:00
COPY requirements.txt .
Use multi-stage container build (#210) This only adds necessary packages and files from the repo to reduce the image size. Co-authored-by: pred2k <does@not.exists>
2021-02-26 15:49:40 +00:00
docker: Upgrade pip before installing requirements Outdated pip versions require a rust compiler to install the cryptography package. Ensuring that pip is up to date should eliminate the recent buildx errors where a prebuilt cryptography wheel is not available.
2021-12-21 21:26:01 +00:00
RUN pip install --upgrade pip
Use multi-stage container build (#210) This only adds necessary packages and files from the repo to reduce the image size. Co-authored-by: pred2k <does@not.exists>
2021-02-26 15:49:40 +00:00
RUN pip install --prefix /install --no-warn-script-location --no-cache-dir -r requirements.txt
Upgrade Python image in Dockerfile (#669) Vulnerable Python image upgraded to python:3.11.0a5-alpine
2022-02-23 16:33:46 +00:00
FROM python:3.11.0a5-alpine
Use multi-stage container build (#210) This only adds necessary packages and files from the repo to reduce the image size. Co-authored-by: pred2k <does@not.exists>
2021-02-26 15:49:40 +00:00
Remove bash dependency Depending on bash wasn't strictly necessary, as the two minimal scripts in the repo were both nearly POSIX anyways. Aside from simplifying the repo's dependencies a little bit, this also helps reduce the overall Docker image size as an added bonus.
2022-01-25 20:07:21 +00:00
RUN apk add --update --no-cache tor curl openrc
docker: Upgrade pip before installing requirements Outdated pip versions require a rust compiler to install the cryptography package. Ensuring that pip is up to date should eliminate the recent buildx errors where a prebuilt cryptography wheel is not available.
2021-12-21 21:26:01 +00:00
# libcurl4-openssl-dev
Improved Dockerfile
2020-05-10 12:00:22 +00:00
Remove bash dependency Depending on bash wasn't strictly necessary, as the two minimal scripts in the repo were both nearly POSIX anyways. Aside from simplifying the repo's dependencies a little bit, this also helps reduce the overall Docker image size as an added bonus.
2022-01-25 20:07:21 +00:00
RUN apk -U upgrade
Run container as non-root `whoogle` user (#617) Creates a non-root user ("whoogle"), and runs the container as that user.
2022-01-21 20:51:51 +00:00
ARG DOCKER_USER=whoogle
ARG DOCKER_USERID=927
Added volume mounted config to Dockerfile (#39)
2020-05-14 00:27:04 +00:00
ARG config_dir=/config
[Docker] Split config dir creation/set permissions If the config dir already exists, setting the mode (`-m 777`) doesn't actually work as it should. This change splits the command into two separate commands for directory creation and enabling the directory to be writable by all. Fixes #658
2022-02-21 16:33:30 +00:00
RUN mkdir -p $config_dir
RUN chmod a+w $config_dir
Added volume mounted config to Dockerfile (#39)
2020-05-14 00:27:04 +00:00
VOLUME $config_dir
Added basic authentication (#51) Username/password can be set either as Dockerfile build arguments or passed into the run script as "--userpass <username:password>"
2020-05-18 16:30:32 +00:00
ARG username=''
ARG password=''
Add tor and http/socks proxy support (#137) * Add tor and http/socks proxy support Allows users to enable/disable tor from the config menu, which will forward all requests through Tor. Also adds support for setting environment variables for alternative proxy support. Setting the following variables will forward requests through the proxy: - WHOOGLE_PROXY_USER (optional) - WHOOGLE_PROXY_PASS (optional) - WHOOGLE_PROXY_TYPE (required) - Can be "http", "socks4", or "socks5" - WHOOGLE_PROXY_LOC (required) - Format: "<ip address>:<port>" See #30 * Refactor acquire_tor_conn -> acquire_tor_identity Also updated travis CI to set up tor * Add check for Tor socket on init, improve Tor error handling Initializing the app sends a heartbeat request to Tor to check for availability, and updates the home page config options accordingly. This heartbeat is sent on every request, to ensure Tor support can be reconfigured without restarting the entire app. If Tor support is enabled, and a subsequent request fails, then a new TorError exception is raised, and the Tor feature is disabled until a valid connection is restored. The max attempts has been updated to 10, since 5 seemed a bit too low for how quickly the attempts go by. * Change send_tor_signal arg type, update function doc send_tor_signal now accepts a stem.Signal arg (a bit cleaner tbh). Also added the doc string for the "disable" attribute in TorError. * Fix tor identity logic in Request.send * Update proxy init, change proxyloc var name Proxy is now only initialized if both type and location are specified, as neither have a default fallback and both are required. I suppose the type could fall back to http, but seems safer this way. Also refactored proxyurl -> proxyloc for the runtime args in order to match the Dockerfile args. * Add tor/proxy support for Docker builds, fix opensearch/init The Dockerfile is now updated to include support for Tor configuration, with a working torrc file included in the repo. An issue with opensearch was fixed as well, which was uncovered during testing and was simple enough to fix here. Likewise, DDG bang gen was updated to only ever happen if the file didn't exist previously, as testing with the file being regenerated every time was tedious. * Add missing "@" for socks proxy requests
2020-10-29 00:47:42 +00:00
ARG proxyuser=''
ARG proxypass=''
ARG proxytype=''
ARG proxyloc=''
Allow setting environment variables in whoogle.env (#237) This allows the user to enable their preferred settings in a variety of ways, depending on their deployment preference. Values added to whoogle.env can be enabled using WHOOGLE_DOTENV=1, in which case all values in the env var file will overwrite defaults or user provided settings. Co-authored-by: Ben Busby <benbusby@protonmail.com>
2021-03-28 17:27:08 +00:00
ARG whoogle_dotenv=''
Feature: https only -- adds option to enforce https on running instances (#48) * Adding HTTPS enforcement Command line runs of Whoogle Search through pip/pipx/etc will need the `--https-only` flag appended to the run command. Docker runs require the `use_https` build arg applied. * Update README.md Moved https-only note to top of docker run command, updated pip runner help output * Dockerfile: removed HTTPS enforcement, updated PORT setting Dockerfile no longer enforces an HTTPS connection, but still allows for setting via a build arg. The Flask server port is now configurable as a build arg as well, by setting a port number to "whoogle_port" * Fixed incorrect port assignment
2020-05-15 21:44:50 +00:00
ARG use_https=''
ARG whoogle_port=5000
Use farside.link for frontend alternatives in results (#560) * Integrate Farside into Whoogle When instances are ratelimited (when a captcha is returned instead of the user's search results) the user can now hop to a new instance via Farside, a new backend service that redirects users to working instances of a particular frontend. In this case, it presents a user with a Farside link to a new Whoogle (or Searx) instance instead, so that the user can resume their search. For the generated Farside->Whoogle link, the generated link includes the user's current Whoogle configuration settings as URL params, to ensure a more seamless transition between instances. This doesn't translate to the Farside->Searx link, but potentially could with some changes. * Expand conversion of config<->url params Config settings can now be translated to and from URL params using a predetermined set of "safe" keys (i.e. config settings that easily translate to URL params). * Allow jumping instances via Farside when ratelimited When instances are ratelimited (when a captcha is returned instead of the user's search results) the user can now hop to a new instance via Farside, a new backend service that redirects users to working instances of a particular frontend. In this case, it presents a user with a Farside link to a new Whoogle (or Searx) instance instead, so that the user can resume their search. For the generated Farside->Whoogle link, the generated link includes the user's current Whoogle configuration settings as URL params, to ensure a more seamless transition between instances. This doesn't translate to the Farside->Searx link, but potentially could with some changes. Closes #554 Closes #559
2021-12-09 00:27:33 +00:00
ARG twitter_alt='farside.link/nitter'
ARG youtube_alt='farside.link/invidious'
Update default bibliogram link in Dockerfile Bibliogram uses a slightly different URL format than Instagram, and requires a "u/" before the username when replacing Instagram links. This was already implemented everywhere else except the Dockerfile.
2022-03-28 16:18:54 +00:00
ARG instagram_alt='farside.link/bibliogram/u'
Use farside.link for frontend alternatives in results (#560) * Integrate Farside into Whoogle When instances are ratelimited (when a captcha is returned instead of the user's search results) the user can now hop to a new instance via Farside, a new backend service that redirects users to working instances of a particular frontend. In this case, it presents a user with a Farside link to a new Whoogle (or Searx) instance instead, so that the user can resume their search. For the generated Farside->Whoogle link, the generated link includes the user's current Whoogle configuration settings as URL params, to ensure a more seamless transition between instances. This doesn't translate to the Farside->Searx link, but potentially could with some changes. * Expand conversion of config<->url params Config settings can now be translated to and from URL params using a predetermined set of "safe" keys (i.e. config settings that easily translate to URL params). * Allow jumping instances via Farside when ratelimited When instances are ratelimited (when a captcha is returned instead of the user's search results) the user can now hop to a new instance via Farside, a new backend service that redirects users to working instances of a particular frontend. In this case, it presents a user with a Farside link to a new Whoogle (or Searx) instance instead, so that the user can resume their search. For the generated Farside->Whoogle link, the generated link includes the user's current Whoogle configuration settings as URL params, to ensure a more seamless transition between instances. This doesn't translate to the Farside->Searx link, but potentially could with some changes. Closes #554 Closes #559
2021-12-09 00:27:33 +00:00
ARG reddit_alt='farside.link/libreddit'
ARG medium_alt='farside.link/scribe'
Update remaining alternative frontends to use Farside Wikipedia, imgur, and translate alternatives were all still using hardcoded URLs when replaced with their respective alternative frontend. This updates them to use farside instead.
2022-03-21 16:08:52 +00:00
ARG translate_alt='farside.link/lingva'
ARG imgur_alt='farside.link/rimgo'
ARG wikipedia_alt='farside.link/wikiless'
Use alpine docker image (#573)
2021-12-19 18:59:06 +00:00
ENV CONFIG_VOLUME=$config_dir \
WHOOGLE_USER=$username \
WHOOGLE_PASS=$password \
WHOOGLE_PROXY_USER=$proxyuser \
WHOOGLE_PROXY_PASS=$proxypass \
WHOOGLE_PROXY_TYPE=$proxytype \
WHOOGLE_PROXY_LOC=$proxyloc \
WHOOGLE_DOTENV=$whoogle_dotenv \
HTTPS_ONLY=$use_https \
EXPOSE_PORT=$whoogle_port \
WHOOGLE_ALT_TW=$twitter_alt \
WHOOGLE_ALT_YT=$youtube_alt \
WHOOGLE_ALT_IG=$instagram_alt \
WHOOGLE_ALT_RD=$reddit_alt \
WHOOGLE_ALT_MD=$medium_alt \
Fix Dockerfile syntax errors
2022-01-14 17:05:24 +00:00
WHOOGLE_ALT_TL=$translate_alt \
WHOOGLE_ALT_IMG=$imgur_alt \
Introduce site alts for imgur and wikipedia (#609) * Add `WHOOGLE_ALT_IMG` for a replacement for imgur. * Add `WHOOGLE_ALT_WIKI` for Wikipedia
2022-01-14 16:59:03 +00:00
WHOOGLE_ALT_WIKI=$wikipedia_alt
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-05 22:01:21 +00:00
Use multi-stage container build (#210) This only adds necessary packages and files from the repo to reduce the image size. Co-authored-by: pred2k <does@not.exists>
2021-02-26 15:49:40 +00:00
WORKDIR /whoogle
COPY --from=builder /install /usr/local
Add heroku-regen script, rename config/ -> misc/ Introduces a new script for quickly regenerating a Heroku instance (typically with a new IP) to handle the rare circumstances where an instance is flagged by Google and prompted for a captcha. The config/ dir was renamed to misc/ to avoid confusion with the Docker mounted config volume, and to more closely match its intended purpose (which is to contain all miscellaneous features/scripts/etc that add functionality to Whoogle, but are not critical for general use).
2021-03-17 16:27:08 +00:00
COPY misc/tor/torrc /etc/tor/torrc
COPY misc/tor/start-tor.sh misc/tor/start-tor.sh
Use multi-stage container build (#210) This only adds necessary packages and files from the repo to reduce the image size. Co-authored-by: pred2k <does@not.exists>
2021-02-26 15:49:40 +00:00
COPY app/ app/
Skip copying whoogle.env in Dockerfile
2021-10-19 18:44:44 +00:00
COPY run .
#COPY whoogle.env .
Added basic docker setup
2020-04-08 20:05:28 +00:00
Run container as non-root `whoogle` user (#617) Creates a non-root user ("whoogle"), and runs the container as that user.
2022-01-21 20:51:51 +00:00
# Create user/group to run as
Remove bash dependency Depending on bash wasn't strictly necessary, as the two minimal scripts in the repo were both nearly POSIX anyways. Aside from simplifying the repo's dependencies a little bit, this also helps reduce the overall Docker image size as an added bonus.
2022-01-25 20:07:21 +00:00
RUN adduser -D -g $DOCKER_USERID -u $DOCKER_USERID $DOCKER_USER
Run container as non-root `whoogle` user (#617) Creates a non-root user ("whoogle"), and runs the container as that user.
2022-01-21 20:51:51 +00:00
# Fix ownership / permissions
[Docker] Split config dir creation/set permissions If the config dir already exists, setting the mode (`-m 777`) doesn't actually work as it should. This change splits the command into two separate commands for directory creation and enabling the directory to be writable by all. Fixes #658
2022-02-21 16:33:30 +00:00
RUN chown -R ${DOCKER_USER}:${DOCKER_USER} /whoogle /var/lib/tor
Run container as non-root `whoogle` user (#617) Creates a non-root user ("whoogle"), and runs the container as that user.
2022-01-21 20:51:51 +00:00
Remove bash dependency Depending on bash wasn't strictly necessary, as the two minimal scripts in the repo were both nearly POSIX anyways. Aside from simplifying the repo's dependencies a little bit, this also helps reduce the overall Docker image size as an added bonus.
2022-01-25 20:07:21 +00:00
# Allow writing symlinks to build dir
RUN chown $DOCKER_USERID:$DOCKER_USERID app/static/build
Run container as non-root `whoogle` user (#617) Creates a non-root user ("whoogle"), and runs the container as that user.
2022-01-21 20:51:51 +00:00
USER $DOCKER_USER:$DOCKER_USER
Feature: https only -- adds option to enforce https on running instances (#48) * Adding HTTPS enforcement Command line runs of Whoogle Search through pip/pipx/etc will need the `--https-only` flag appended to the run command. Docker runs require the `use_https` build arg applied. * Update README.md Moved https-only note to top of docker run command, updated pip runner help output * Dockerfile: removed HTTPS enforcement, updated PORT setting Dockerfile no longer enforces an HTTPS connection, but still allows for setting via a build arg. The Flask server port is now configurable as a build arg as well, by setting a port number to "whoogle_port" * Fixed incorrect port assignment
2020-05-15 21:44:50 +00:00
EXPOSE $EXPOSE_PORT
Improved Dockerfile
2020-05-10 12:00:22 +00:00
Remove bash dependency Depending on bash wasn't strictly necessary, as the two minimal scripts in the repo were both nearly POSIX anyways. Aside from simplifying the repo's dependencies a little bit, this also helps reduce the overall Docker image size as an added bonus.
2022-01-25 20:07:21 +00:00
HEALTHCHECK --interval=30s --timeout=5s \
Use curl-based healthcheck w/ new non-auth route The wget method seemed to have a possible issue with creating endless index.html copies (despite being specified to output to console only), so this has been updated to use curl instead. Also uses new non-authenticated "healthz" route to perform the healthcheck. Fix #316 Fix #313
2021-05-18 15:48:15 +00:00
CMD curl -f http://localhost:${EXPOSE_PORT}/healthz || exit 1
Add healthcheck to Dockerfile See #184
2021-03-08 17:38:40 +00:00
Add heroku-regen script, rename config/ -> misc/ Introduces a new script for quickly regenerating a Heroku instance (typically with a new IP) to handle the rare circumstances where an instance is flagged by Google and prompted for a captcha. The config/ dir was renamed to misc/ to avoid confusion with the Docker mounted config volume, and to more closely match its intended purpose (which is to contain all miscellaneous features/scripts/etc that add functionality to Whoogle, but are not critical for general use).
2021-03-17 16:27:08 +00:00
CMD misc/tor/start-tor.sh & ./run
Reference in New Issue Copy Permalink