Skip to content

Commit

Permalink
Merge branch 'master' into python38-migration
Browse files Browse the repository at this point in the history
  • Loading branch information
lemonsaurus authored Mar 1, 2020
2 parents 91c6bcd + 0bb89db commit 126b759
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 2 deletions.
7 changes: 5 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,15 @@ ENV PIP_NO_CACHE_DIR=false \
# Install pipenv
RUN pip install -U pipenv

# Copy project files into working directory
# Create the working directory
WORKDIR /bot
COPY . .

# Install project dependencies
COPY Pipfile* ./
RUN pipenv install --system --deploy

# Copy the source code in last to optimize rebuilding the image
COPY . .

ENTRYPOINT ["python3"]
CMD ["-m", "bot"]
24 changes: 24 additions & 0 deletions config-default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,30 @@ filter:
domain_blacklist:
- pornhub.com
- liveleak.com
- grabify.link
- bmwforum.co
- leancoding.co
- spottyfly.com
- stopify.co
- yoütu.be
- discörd.com
- minecräft.com
- freegiftcards.co
- disçordapp.com
- fortnight.space
- fortnitechat.site
- joinmy.site
- curiouscat.club
- catsnthings.fun
- yourtube.site
- youtubeshort.watch
- catsnthing.com
- youtubeshort.pro
- canadianlumberjacks.online
- poweredbydialup.club
- poweredbydialup.online
- poweredbysecurity.org
- poweredbysecurity.online

word_watchlist:
- goo+ks*
Expand Down

0 comments on commit 126b759

Please sign in to comment.