Updates to Dockerfile. Also updated README.md with build steps that have

changed.
This commit is contained in:
Tim McIver 2016-08-16 23:59:21 -04:00
parent 7ae64cdb01
commit fd6c2188f6
2 changed files with 7 additions and 12 deletions

View File

@ -4,17 +4,11 @@ RUN apt-get update -q && \
apt-get install -qy git nodejs nodejs-legacy && \
apt-get clean && \
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
ADD stack.yaml /opt/unison/stack.yaml
ADD . /opt/unison
RUN stack setup
ADD editor/stack.yaml /opt/unison/editor/stack.yaml
RUN cd editor && stack setup
ADD shared/unison-shared.cabal /opt/unison/shared/unison-shared.cabal
ADD node/unison-node.cabal /opt/unison/node/unison-node.cabal
RUN stack build --only-dependencies
ADD editor/unison-editor.cabal /opt/unison/editor/unison-editor.cabal
RUN cd editor && stack build --only-dependencies
ADD . /opt/unison/
RUN stack build unison-node
RUN cd editor && stack build && ln -s $(stack path --local-install-root)/bin .
RUN stack --stack-yaml editor.yaml setup
RUN stack --stack-yaml editor.yaml build
RUN ln -s $(stack --stack-yaml editor.yaml path --local-install-root)/bin editor
CMD stack exec node
EXPOSE 8080

View File

@ -34,7 +34,7 @@ The easiest way to compile Unison yourself is to use the provided Dockerfile.
If you have [Docker set up correctly](https://docs.docker.com/engine/installation/),
just run
```sh
$ git clone https://github.com/unisonweb/platform.git unisonweb
$ git clone https://github.com/unisonweb/unison.git unisonweb
$ cd unisonweb
$ docker build -t unisonweb/platform .
```
@ -59,6 +59,7 @@ The build uses [Stack](http://docs.haskellstack.org/). If you don't already have
$ git clone https://github.com/unisonweb/unison.git
$ cd unison
$ stack --version # make sure this returns 1.0.2 or later
$ stack setup
$ stack build unison-node # build node executable
```
@ -73,7 +74,7 @@ The editor is built using GHCJS. If you encounter an issue about missing 'happy'
_After_ `stack build` completes successfully, you can symlink the generated Javascript files by performing a
```sh
$ ln -s $(stack path --local-install-root)/bin editor
$ ln -s $(stack --stack-yaml editor.yaml path --local-install-root)/bin editor
```
You can run it by doing: