github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-24 14:28:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6112 from atom/ks-fedora-21

Browse Source 
Build rpm package on Fedora 21
This commit is contained in:
Kevin Sawicki
2015-03-26 10:48:51 -07:00
parent 307e2ad565 871c32b75d
commit 42549db218
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Dockerfile
View File

@@ -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 \
@@ -12,11 +12,11 @@ RUN yum install -y \
glibc-devel \
git-core \
libgnome-keyring-devel \
rpmdevtools
rpmdevtools \
nodejs \
npm
# Install node
RUN curl -sL https://rpm.nodesource.com/setup | bash -
RUN yum install -y nodejs
RUN npm install -g npm@1.4.28 --loglevel error
ADD . /atom
WORKDIR /atom

2
script/utils/verify-requirements.js
View File

@@ -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);
});