From 06da4153e8cb725061f5a9d757d269c9b423f92d Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Thu, 26 Mar 2015 10:09:15 -0700
Subject: [PATCH 1/7] Build on fedora 21

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 76fa18eae..be5624b21 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@
 # DESCRIPTION:    Image to build Atom and create a .rpm file
 
 # Base docker image
-FROM fedora:20
+FROM fedora:21
 
 # Install dependencies
 RUN yum install -y \

From dafa40fd4dba56282f82920e7e240711c40fd444 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Thu, 26 Mar 2015 10:13:49 -0700
Subject: [PATCH 2/7] Try using canonical nodejs npm packages

---
 Dockerfile | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index be5624b21..c8eca8804 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,11 +12,9 @@ RUN yum install -y \
     glibc-devel \
     git-core \
     libgnome-keyring-devel \
-    rpmdevtools
-
-# Install node
-RUN curl -sL https://rpm.nodesource.com/setup | bash -
-RUN yum install -y nodejs
+    rpmdevtools \
+    nodejs \
+    npm
 
 ADD . /atom
 WORKDIR /atom

From ad87ed5c40ef6f9a839575d66179db26a972e559 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Thu, 26 Mar 2015 10:23:56 -0700
Subject: [PATCH 3/7] Log detected version

---
 script/utils/verify-requirements.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/utils/verify-requirements.js b/script/utils/verify-requirements.js
index 554c27dd0..693af4a2b 100644
--- a/script/utils/verify-requirements.js
+++ b/script/utils/verify-requirements.js
@@ -57,7 +57,7 @@ function verifyNpm(cb) {
     var npmMajorVersion = +versionArray[0] || 0;
     var npmMinorVersion = +versionArray[1] || 0;
     if (npmMajorVersion === 1 && npmMinorVersion < 4)
-      cb("npm v1.4+ is required to build Atom.");
+      cb("npm v1.4+ is required to build Atom. Version " + npmVersion + " was detected");
     else
       cb(null, "npm: v" + npmVersion);
   });

From a08c939699246472d55c0c30fd13f6baef61f1d5 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Thu, 26 Mar 2015 10:25:05 -0700
Subject: [PATCH 4/7] Disable npm version check on CI

---
 script/utils/verify-requirements.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/utils/verify-requirements.js b/script/utils/verify-requirements.js
index 693af4a2b..36bf85b21 100644
--- a/script/utils/verify-requirements.js
+++ b/script/utils/verify-requirements.js
@@ -56,7 +56,7 @@ function verifyNpm(cb) {
     var versionArray = npmVersion.split('.');
     var npmMajorVersion = +versionArray[0] || 0;
     var npmMinorVersion = +versionArray[1] || 0;
-    if (npmMajorVersion === 1 && npmMinorVersion < 4)
+    if (npmMajorVersion === 1 && npmMinorVersion < 4 && !process.env.JANKY_SHA1)
       cb("npm v1.4+ is required to build Atom. Version " + npmVersion + " was detected");
     else
       cb(null, "npm: v" + npmVersion);

From 9bc723f4907dfb16527e9a792753e7fe8609f312 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Thu, 26 Mar 2015 10:27:34 -0700
Subject: [PATCH 5/7] Upgrade to npm 1.4 on Fedora

---
 Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index c8eca8804..31726e401 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,5 +16,7 @@ RUN yum install -y \
     nodejs \
     npm
 
+RUN npm install -g npm@1.4.28
+
 ADD . /atom
 WORKDIR /atom

From 67843c8ebd19f537266e44cfc6af4a923317ebbf Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Thu, 26 Mar 2015 10:33:21 -0700
Subject: [PATCH 6/7] Remove Janky bypass of npm version check

---
 script/utils/verify-requirements.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/script/utils/verify-requirements.js b/script/utils/verify-requirements.js
index 36bf85b21..890172753 100644
--- a/script/utils/verify-requirements.js
+++ b/script/utils/verify-requirements.js
@@ -56,8 +56,8 @@ function verifyNpm(cb) {
     var versionArray = npmVersion.split('.');
     var npmMajorVersion = +versionArray[0] || 0;
     var npmMinorVersion = +versionArray[1] || 0;
-    if (npmMajorVersion === 1 && npmMinorVersion < 4 && !process.env.JANKY_SHA1)
-      cb("npm v1.4+ is required to build Atom. Version " + npmVersion + " was detected");
+    if (npmMajorVersion === 1 && npmMinorVersion < 4)
+      cb("npm v1.4+ is required to build Atom. Version " + npmVersion + " was detected.");
     else
       cb(null, "npm: v" + npmVersion);
   });

From 871c32b75dc5aa9cd10610db2e8d1e9995209af7 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Thu, 26 Mar 2015 10:38:58 -0700
Subject: [PATCH 7/7] Only log install errors

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 31726e401..d792c30c5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,7 +16,7 @@ RUN yum install -y \
     nodejs \
     npm
 
-RUN npm install -g npm@1.4.28
+RUN npm install -g npm@1.4.28 --loglevel error
 
 ADD . /atom
 WORKDIR /atom