allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hei...@apache.org
Subject [10/11] allura git commit: [#8039] can do the same thing for broccoli, since we already use "npm run build" instead of invoking it directly
Date Mon, 18 Jan 2016 20:31:46 GMT
[#8039] can do the same thing for broccoli, since we already use "npm run build" instead of
invoking it directly


Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/5757f004
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/5757f004
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/5757f004

Branch: refs/heads/master
Commit: 5757f00403e764556c21b68ad7da6d3f9559b439
Parents: 7410896
Author: Dave Brondsema <dave@brondsema.net>
Authored: Mon Jan 18 14:34:56 2016 -0500
Committer: Heith Seewald <heiths@gmail.com>
Committed: Mon Jan 18 14:43:56 2016 -0500

----------------------------------------------------------------------
 Allura/docs/getting_started/installation.rst | 1 -
 Dockerfile                                   | 3 ---
 package.json                                 | 1 +
 3 files changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/5757f004/Allura/docs/getting_started/installation.rst
----------------------------------------------------------------------
diff --git a/Allura/docs/getting_started/installation.rst b/Allura/docs/getting_started/installation.rst
index c8d5aae..a96f329 100644
--- a/Allura/docs/getting_started/installation.rst
+++ b/Allura/docs/getting_started/installation.rst
@@ -191,7 +191,6 @@ For non-Ubuntu installations see https://nodejs.org/en/download/package-manager/
     (env-allura)~$ curl --silent --location https://deb.nodesource.com/setup_4.x | sudo bash
-
     (env-allura)~$ sudo apt-get install nodejs
     (env-allura)~$ cd ~/src/allura
-    (env-allura)~$ sudo npm install -g broccoli-cli
     (env-allura)~$ npm install
     (env-allura)~$ npm run build
 

http://git-wip-us.apache.org/repos/asf/allura/blob/5757f004/Dockerfile
----------------------------------------------------------------------
diff --git a/Dockerfile b/Dockerfile
index 54a1b3a..2ea2e18 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -35,9 +35,6 @@ RUN apt-get update && apt-get install -y \
 RUN curl --silent --location https://deb.nodesource.com/setup_4.x | sudo bash - &&
\
     apt-get install --yes nodejs
 
-# only do the global installation here.  All local packages are installed in init-docker-dev.sh,
since they need the shared mount
-RUN npm install -g broccoli-cli
-
 # Snapshot generation for SVN (and maybe other SCMs) might fail without this
 RUN locale-gen en_US.UTF-8
 ENV LANG en_US.UTF-8

http://git-wip-us.apache.org/repos/asf/allura/blob/5757f004/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index 4635705..94702bb 100644
--- a/package.json
+++ b/package.json
@@ -19,6 +19,7 @@
   "devDependencies": {
     "broccoli": "^0.16.8",
     "broccoli-babel-transpiler": "^5.4.5",
+    "broccoli-cli": "^1.0.0",
     "broccoli-funnel": "^0.2.8",
     "broccoli-merge-trees": "^0.2.3",
     "broccoli-sourcemap-concat": "^2.0.1",


Mime
View raw message