Skip to content

Commit

Permalink
[pre-commit.ci] auto fixes from pre-commit.com hooks
Browse files Browse the repository at this point in the history
for more information, see https://pre-commit.ci
  • Loading branch information
pre-commit-ci[bot] committed Nov 1, 2021
1 parent 05ad94e commit f23870c
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 18 deletions.
8 changes: 3 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ FROM python:3.9-slim-bullseye

RUN apt-get -y update

# install curl
# install curl
RUN apt-get -y install curl

# get install script and pass it to execute:
# get install script and pass it to execute:
RUN curl -sL https://deb.nodesource.com/setup_14.x | bash

# and install node
# and install node
RUN apt-get -y install nodejs git wget unzip build-essential make postgresql libpq-dev python-dev

# We don't want to run our application as root if it is not strictly necessary, even in a container.
Expand Down Expand Up @@ -43,5 +43,3 @@ USER app
# As this image is used for different
# purposes and processes no CMD or ENTRYPOINT is specified here,
# this is done in docker-compose.yml.


10 changes: 5 additions & 5 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ services:
- 5000:5000
command: sh ./runserver.sh
volumes:
#- .:/app
- $HOME/.aws/credentials:/app/.aws/credentials:ro
#- .:/app
- $HOME/.aws/credentials:/app/.aws/credentials:ro
worker:
image: master-image
depends_on:
- redis
command: sh ./rq.sh
volumes:
- $HOME/.aws/credentials:/app/.aws/credentials:ro
- $HOME/.aws/credentials:/app/.aws/credentials:ro
redis:
image: redis
nginx:
Expand All @@ -30,8 +30,8 @@ services:
ports:
- 80:80
- 443:443
command: "/bin/sh -c 'while :; do sleep 6h & wait $${!}; nginx -s reload; done & nginx -g \"daemon off;error_log /dev/stdout info;\"'"
command: '/bin/sh -c ''while :; do sleep 6h & wait $${!}; nginx -s reload; done & nginx -g "daemon off;error_log /dev/stdout info;"'''
depends_on:
- web
volumes:
static_data:
static_data:
5 changes: 3 additions & 2 deletions fabfile.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from fabric.api import task, run
from fabric.api import task


@task
def hello():
print("wonderful print")
print("wonderful print")
6 changes: 3 additions & 3 deletions funnel/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
from flask_redis import FlaskRedis
from flask_rq2 import RQ

from whitenoise import WhiteNoise
import geoip2.database

from baseframe import Bundle, Version, assets, baseframe
from baseframe.blueprint import THEME_FILES
import coaster.app
from whitenoise import WhiteNoise

from ._version import __version__
from .executor import ExecutorWrapper
Expand All @@ -31,8 +31,8 @@
mail = Mail()
pages = FlatPages()

app.config['CACHE_REDIS_URL']="redis://redis:6379/0"
app.config['REDIS_URL']="redis://redis:6379/0"
app.config['CACHE_REDIS_URL'] = "redis://redis:6379/0"
app.config['REDIS_URL'] = "redis://redis:6379/0"

redis_store = FlaskRedis(decode_responses=True)
rq = RQ()
Expand Down
4 changes: 2 additions & 2 deletions nginx/default.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@

upstream flask {
server web:5000;
}
Expand All @@ -7,7 +7,7 @@
listen 80;
listen [::]:80;
server_name hasgeek.dev;

client_max_body_size 4G;
keepalive_timeout 5;
client_body_timeout 300s;
Expand Down
2 changes: 1 addition & 1 deletion requirements.in
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,4 @@ zxcvbn==4.4.28
awscli
fabric3
js2py
whitenoise
whitenoise

0 comments on commit f23870c

Please sign in to comment.