From 8024a04668200a42462f9153837bc6b211efcfeb Mon Sep 17 00:00:00 2001
From: Karen Konou <konoukaren@gmail.com>
Date: Tue, 9 Nov 2021 10:26:30 +0100
Subject: [PATCH] [build] fix docker build
---
Dockerfile.dev | 1 +
README.md | 12 ++----------
package.json | 1 +
3 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/Dockerfile.dev b/Dockerfile.dev
index 35b97196..dec9e6cf 100644
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -10,6 +10,7 @@ RUN apt-get update && apt-get install -y yarn
RUN curl -L https://github.com/coot/zephyr/releases/download/v0.3.2/Linux.tar.gz | tar zx -C /usr/bin --strip-components=1 zephyr/zephyr
RUN curl -L https://github.com/dhall-lang/dhall-haskell/releases/download/1.38.1/dhall-json-1.7.6-x86_64-linux.tar.bz2 | tar jx -C /usr/bin --strip-components=2 ./bin/dhall-to-json
+RUN yarn global add purescript spago pulp
WORKDIR /opt/app
EXPOSE 5000/tcp
diff --git a/README.md b/README.md
index f9c182fb..43dcde90 100644
--- a/README.md
+++ b/README.md
@@ -144,11 +144,10 @@ the docker container.
### Basic tasks
Now we must install our javascript and purescript dependencies:
-*Note: if you're installing manually you might also need to manually install [psc-package](https://github.com/purescript/psc-package)*
```shell
-darn install -D && darn install-ps # for docker setup
-yarn install -D && yarn install-ps # for manual setup
+darn install -D # for docker setup
+yarn install -D # for manual setup
```
You will likely want to check your work in a browser. We provide a
@@ -166,13 +165,6 @@ darn build # for docker setup
yarn build # for manual setup
```
-If you are rapidly iterating and just want to type check your code:
-
-```shell
-darn compile # for docker setup
-yarn compile # for manual setup
-```
-
You may access a purescript repl if you want to explore:
```shell
diff --git a/package.json b/package.json
index d976b08b..d7771cec 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
"clean-js": "rm -Rf node_modules",
"clean-ps": "rm -Rf output",
"server": "serve dist",
+ "build": "spago build && pulp browserify --skip-compile -t dist/bundle.js --src-path output",
"prod": "yarn prod:compile && yarn prod:dce && yarn prod:bundle && yarn prod:pack",
"prod:compile": "pulp build -- -g corefn",
"prod:dce": "zephyr -f Main.main",
--
2.21.0