From 6def28852125b2bcb99f3c666c5da23553173714 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 13 Dec 2019 12:17:54 +0000
Subject: [PATCH 1/3] Slightly better docker support

So you can run yarn install in the docker container
---
 .gitignore                              | 1 +
 package.json                            | 3 +++
 scripts/{dockerbuild.sh => indocker.sh} | 4 ++--
 3 files changed, 6 insertions(+), 2 deletions(-)
 rename scripts/{dockerbuild.sh => indocker.sh} (85%)

diff --git a/.gitignore b/.gitignore
index 776ab13d..6038e93c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,5 @@
 /packages
 /deploys
 /node_modules
+/docker_node_modules
 /pkg/control
diff --git a/package.json b/package.json
index 89f2000e..3f9f26c4 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,9 @@
     "start": "electron .",
     "lint": "eslint src/",
     "build": "yarn run setversion && electron-builder",
+    "indocker": "scripts/indocker.sh",
+    "docker:build": "yarn run indocker yarn run build",
+    "docker:install": "yarn run indocker yarn install",
     "clean": "rimraf webapp.asar dist packages deploys"
   },
   "dependencies": {
diff --git a/scripts/dockerbuild.sh b/scripts/indocker.sh
similarity index 85%
rename from scripts/dockerbuild.sh
rename to scripts/indocker.sh
index 19b22b9a..7b2d908f 100755
--- a/scripts/dockerbuild.sh
+++ b/scripts/indocker.sh
@@ -6,7 +6,7 @@ docker run --rm -ti \
  --env ELECTRON_CACHE="/root/.cache/electron" \
  --env ELECTRON_BUILDER_CACHE="/root/.cache/electron-builder" \
  -v ${PWD}:/project \
- -v ${PWD##*/}-node-modules:/project/node_modules \
+ -v ${PWD}/docker_node_modules:/project/node_modules \
  -v ~/.cache/electron:/root/.cache/electron \
  -v ~/.cache/electron-builder:/root/.cache/electron-builder \
- electronuserland/builder yarn run build
+ electronuserland/builder "$@"

From c9be601c7f9997072a1dc7ac91aa42877f586c0d Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 13 Dec 2019 12:18:32 +0000
Subject: [PATCH 2/3] Fix readme

---
 README | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README b/README
index ffdd78a9..86d1a376 100644
--- a/README
+++ b/README
@@ -60,7 +60,8 @@ This will do a couple of things:
 
 You can also build using docker, which will always produce the linux package:
 ```
-yarn run dockerbuild
+yarn run docker:install
+yarn run docker:build
 ```
 
 After running, the packages should be in `dist/`.

From 9a3c0f7cdc1472a81904bc7ef7d1855943ea8b2c Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 13 Dec 2019 16:37:07 +0000
Subject: [PATCH 3/3] rename indocker script

---
 package.json                          | 6 +++---
 scripts/{indocker.sh => in-docker.sh} | 0
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename scripts/{indocker.sh => in-docker.sh} (100%)

diff --git a/package.json b/package.json
index 3f9f26c4..177c4dc5 100644
--- a/package.json
+++ b/package.json
@@ -18,9 +18,9 @@
     "start": "electron .",
     "lint": "eslint src/",
     "build": "yarn run setversion && electron-builder",
-    "indocker": "scripts/indocker.sh",
-    "docker:build": "yarn run indocker yarn run build",
-    "docker:install": "yarn run indocker yarn install",
+    "in-docker": "scripts/in-docker.sh",
+    "docker:build": "yarn run in-docker yarn run build",
+    "docker:install": "yarn run in-docker yarn install",
     "clean": "rimraf webapp.asar dist packages deploys"
   },
   "dependencies": {
diff --git a/scripts/indocker.sh b/scripts/in-docker.sh
similarity index 100%
rename from scripts/indocker.sh
rename to scripts/in-docker.sh