From 1cb2b67eb210a221574aef5cf4f8d091a1c330b9 Mon Sep 17 00:00:00 2001 From: Eduardo Cuducos Date: Wed, 1 Feb 2017 16:40:24 -0200 Subject: [PATCH 1/2] Install yarn the proper way in Docker --- Dockerfile-elm | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/Dockerfile-elm b/Dockerfile-elm index bf230f9..ef23959 100644 --- a/Dockerfile-elm +++ b/Dockerfile-elm @@ -1,9 +1,17 @@ FROM node:6.9.1 -RUN npm install -g yarn + +RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add - +RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list +RUN sudo apt-get update +RUN sudo apt-get install yarn + WORKDIR /code -COPY elm-package.json elm-package.json + +COPY yarn.lock yarn.lock COPY package.json package.json +COPY elm-package.json elm-package.json COPY gulpfile.js gulpfile.js -RUN yarn install +RUN yarn install --pure-lockfile + COPY jarbas jarbas CMD yarn assets From e04aaffdb7f571cc3be6d49add602c33c14f5db3 Mon Sep 17 00:00:00 2001 From: Eduardo Cuducos Date: Wed, 1 Feb 2017 16:46:23 -0200 Subject: [PATCH 2/2] Remove mentions to npm --- README.md | 2 +- docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0f48e53..06b3934 100644 --- a/README.md +++ b/README.md @@ -175,7 +175,7 @@ You can get the datasets running [Rosie](https://github.com/datasciencebr/rosie) #### Requirements -Jarbas requires [Python 3.5](http://python.org), [Node.js 6](http://nodejs.org) with [Yarn](https://yarnpkg.com), and [PostgreSQL 9.4+](https://www.postgresql.org). +Jarbas requires [Python 3.5](http://python.org), [Yarn](https://yarnpkg.com), and [PostgreSQL 9.4+](https://www.postgresql.org). Once you have `pip` and `yarn` available install the dependencies: diff --git a/docker-compose.yml b/docker-compose.yml index 9fae023..1c9226b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -31,7 +31,7 @@ services: - "./:/code" - "/code/node_modules" - "assets:/code/jarbas/frontend/static" - command: [npm, run, watch] + command: [yarn, watch] nginx: build: context: .