diff --git a/src/api/scripts/entrypoint.sh b/src/api/scripts/entrypoint.sh index a467a45..001d26a 100644 --- a/src/api/scripts/entrypoint.sh +++ b/src/api/scripts/entrypoint.sh @@ -2,7 +2,7 @@ set -e -if [ -f /app/app.py ]; then +if [ -f /app/flask_api.py ]; then DEFAULT_MODULE_NAME=flask_api fi MODULE_NAME=${MODULE_NAME:-$DEFAULT_MODULE_NAME} diff --git a/src/api/scripts/run.sh b/src/api/scripts/run.sh index 56759cb..8d2a6f7 100644 --- a/src/api/scripts/run.sh +++ b/src/api/scripts/run.sh @@ -10,89 +10,8 @@ else echo "There is no prescript $PRE_START_PATH" fi -#waitress-serve --trusted-proxy='*' \ -#--trusted-proxy-headers="x-forwarded-for","x-forwarded-host","x-forwarded-proto","x-forwarded-port" \ -#--log-untrusted-proxy-headers --threads=16 --call api:create_app - -params="" - -if [[ -v WAITRESS_LISTEN ]]; then - listeners=$(echo "$WAITRESS_LISTEN" | tr "," "\n") - for listener in $listeners - do - if [[ -z $params ]]; then - params="--listen=$listener" - else - params=" $params --listen=$listener" - fi - done -else - if [[ -v WAITRESS_HOST ]]; then - if [[ -z $params ]]; then - params="--host=$WAITRESS_HOST" - else - params=" $params --host=$WAITRESS_HOST" - fi - fi - if [[ -v WAITRESS_PORT ]]; then - if [[ -z $params ]]; then - params="--port=$WAITRESS_PORT" - else - params=" $params --port=$WAITRESS_PORT" - fi - fi -fi - -if [[ -z $params ]]; then - params="--listen=*:8080" -fi - -if [[ -v WAITRESS_CALL ]]; then - params=" $params --call" -fi -if [[ -v WAITRESS_NO_IPV6 ]]; then - params=" $params --no-ipv6" -fi -if [[ -v WAITRESS_NO_IPV4 ]]; then - params=" $params --no-ipv4" -fi -if [[ -v WAITRESS_EXPOSE_TRACEBACKS ]]; then - params=" $params --expose-tracebacks" -fi -if [[ -v WAITRESS_NO_EXPOSE_TRACEBACKS ]]; then - params=" $params --no-expose-tracebacks" -fi -if [[ -v WAITRESS_THREADS ]]; then - params=" $params --threads=$WAITRESS_THREADS" -fi -if [[ -v WAITRESS_IDENT ]]; then - params=" $params --ident=$WAITRESS_IDENT" -fi -if [[ -v WAITRESS_OUTBUF_OVERFLOW ]]; then - params=" $params --outbuf_overflow=$WAITRESS_OUTBUF_OVERFLOW" -fi -if [[ -v WAITRESS_OUTBUF_HIGH_WATERMARK ]]; then - params=" $params --outbuf_high_watermark=$WAITRESS_OUTBUF_HIGH_WATERMARK" -fi -if [[ -v WAITRESS_INBUF_OVERFLOW ]]; then - params=" $params --inbuf_overflow=$WAITRESS_INBUF_OVERFLOW" -fi -if [[ -v WAITRESS_CONNECTION_LIMIT ]]; then - params=" $params --connection_limit=$WAITRESS_CONNECTION_LIMIT" -fi -if [[ -v WAITRESS_MAX_REQUEST_HEADER_SIZE ]]; then - params=" $params --max_request_header_size=$WAITRESS_MAX_REQUEST_HEADER_SIZE" -fi -if [[ -v WAITRESS_MAX_REQUEST_BODY_SIZE ]]; then - params=" $params --max_request_body_size=$WAITRESS_MAX_REQUEST_BODY_SIZE" -fi -if [[ -v WAITRESS_ASYNCORE_LOOP_TIMEOUT ]]; then - params=" $params --asyncore_loop_timeout=$WAITRESS_ASYNCORE_LOOP_TIMEOUT" -fi -if [[ -v WAITRESS_ASYNCORE_USE_POLL ]]; then - params=" $params --asyncore_use_poll=$WAITRESS_ASYNCORE_USE_POLL" -fi - # Start Waitress -echo "waitress-serve $params $APP_MODULE" -exec waitress-serve $params $APP_MODULE +echo "waitress-serve $APP_MODULE" +exec waitress-serve --listen=*:8080 --trusted-proxy='*' \ +--trusted-proxy-headers="x-forwarded-for","x-forwarded-host","x-forwarded-proto","x-forwarded-port" \ +--log-untrusted-proxy-headers --threads=16 --call $APP_MODULE