Merge remote-tracking branch 'upstream/master'

2025-08-07 14:35:26 +02:00 · 2021-09-16 19:08:49 +03:00 · 2021-09-16 19:08:49 +03:00 · 49a19edc0a
commit 49a19edc0a
parent 39a8e80321 3552105e38
3 changed files with 659 additions and 590 deletions
--- a/.dockerignore
+++ b/.dockerignore
@ -1 +1,4 @@
+.db
 node_modules
+docker
+test
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -11,3 +11,4 @@ services:
      - ./config/production.json:/usr/src/app/config/production.json:ro
      - ./public/uploads:/usr/src/app/public/uploads
      - ./.db:/usr/src/app/.db
+      - /usr/src/app/node_modules
--- a/yarn.lock
+++ b/yarn.lock