aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Leon Sandøy <[email protected]>2020-03-01 23:07:06 +0100
committerGravatar GitHub <[email protected]>2020-03-01 23:07:06 +0100
commit126b759f9817e2f89af00e628fe499bd98370236 (patch)
tree27ab6501be3602b4a802561d5a48b96df6a6d335
parentModify log test regex to be non-os-specific (diff)
parentMerge pull request #809 from python-discord/ban-grabify-urls (diff)
Merge branch 'master' into python38-migration
-rw-r--r--Dockerfile7
-rw-r--r--config-default.yml24
2 files changed, 29 insertions, 2 deletions
diff --git a/Dockerfile b/Dockerfile
index 22ebcd667..06a538b2a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -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"]
diff --git a/config-default.yml b/config-default.yml
index ab237423f..9beb610cc 100644
--- a/config-default.yml
+++ b/config-default.yml
@@ -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*