Merge remote-tracking branch 'origin/main' into heroku-app

This commit is contained in:
Ben Busby 2021-05-18 12:09:32 -04:00
commit 3d2e3283a9
No known key found for this signature in database
GPG Key ID: 3B08611DF6E62ED2
2 changed files with 7 additions and 2 deletions

View File

@ -16,7 +16,7 @@ FROM python:3.8-slim
RUN apt-get update && apt-get install -y \
libcurl4-openssl-dev \
tor \
wget \
curl \
&& rm -rf /var/lib/apt/lists/*
ARG config_dir=/config
@ -70,6 +70,6 @@ COPY whoogle.env .
EXPOSE $EXPOSE_PORT
HEALTHCHECK --interval=30s --timeout=5s \
CMD wget -qO- --no-verbose --tries=1 http://localhost:${EXPOSE_PORT}/ || exit 1
CMD curl -f http://localhost:${EXPOSE_PORT}/healthz || exit 1
CMD misc/tor/start-tor.sh & ./run

View File

@ -110,6 +110,11 @@ def unknown_page(e):
return redirect(g.app_location)
@app.route('/healthz', methods=['GET'])
def healthz():
return ''
@app.route('/', methods=['GET'])
@auth_required
def index():