From c5d10d02fc83ed0453cffcbbd635e9747b4096f3 Mon Sep 17 00:00:00 2001
From: Jakob Ackermann <das7pad@outlook.com>
Date: Wed, 19 Feb 2020 12:23:20 +0100
Subject: [PATCH] [misc] move the sqlite database into a db/ directory

---
 .dockerignore               | 1 +
 Dockerfile                  | 2 ++
 buildscript.txt             | 1 +
 config/settings.defaults.js | 8 +++-----
 db/.gitignore               | 2 ++
 5 files changed, 9 insertions(+), 5 deletions(-)
 create mode 100644 db/.gitignore

diff --git a/.dockerignore b/.dockerignore
index ba1c344..35f8905 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -5,3 +5,4 @@ gitrev
 .npm
 .nvmrc
 nodemon.json
+db/
diff --git a/Dockerfile b/Dockerfile
index 27158b5..3fbae08 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -24,5 +24,7 @@ COPY . /app
 FROM base
 
 COPY --from=app /app /app
+RUN mkdir -p db \
+&&  chown node:node db
 
 CMD ["node", "--expose-gc", "app.js"]
diff --git a/buildscript.txt b/buildscript.txt
index 1f08934..72b0f6a 100644
--- a/buildscript.txt
+++ b/buildscript.txt
@@ -1,5 +1,6 @@
 clsi
 --acceptance-creds=None
+--data-dirs=db
 --dependencies=
 --docker-repos=gcr.io/overleaf-ops
 --env-add=
diff --git a/config/settings.defaults.js b/config/settings.defaults.js
index b0fd0cb..021c9cd 100644
--- a/config/settings.defaults.js
+++ b/config/settings.defaults.js
@@ -9,7 +9,7 @@ module.exports = {
       username: 'clsi',
       dialect: 'sqlite',
       storage:
-        process.env.SQLITE_PATH || Path.resolve(__dirname + '/../db.sqlite'),
+        process.env.SQLITE_PATH || Path.resolve(__dirname + '/../db/db.sqlite'),
       pool: {
         max: 1,
         min: 1
@@ -65,8 +65,7 @@ if (process.env.DOCKER_RUNNER) {
     dockerRunner: process.env.DOCKER_RUNNER === 'true',
     docker: {
       image:
-        process.env.TEXLIVE_IMAGE ||
-        'quay.io/sharelatex/texlive-full:2017.1',
+        process.env.TEXLIVE_IMAGE || 'quay.io/sharelatex/texlive-full:2017.1',
       env: {
         HOME: '/tmp'
       },
@@ -93,8 +92,7 @@ if (process.env.DOCKER_RUNNER) {
 
   module.exports.path.synctexBaseDir = () => '/compile'
 
-  module.exports.path.sandboxedCompilesHostDir =
-    process.env.COMPILES_HOST_DIR
+  module.exports.path.sandboxedCompilesHostDir = process.env.COMPILES_HOST_DIR
 
   module.exports.path.synctexBinHostPath = process.env.SYNCTEX_BIN_HOST_PATH
 }
diff --git a/db/.gitignore b/db/.gitignore
new file mode 100644
index 0000000..d6b7ef3
--- /dev/null
+++ b/db/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore