Skip to content

Commit

Permalink
Merge remote-tracking branch 'yarnpkg/master' into issue-2600
Browse files Browse the repository at this point in the history
  • Loading branch information
mnsn committed Feb 19, 2017
2 parents 0edf22e + 7182302 commit 3463426
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 42 deletions.
42 changes: 0 additions & 42 deletions Dockerfile

This file was deleted.

26 changes: 26 additions & 0 deletions Dockerfile.dev
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# Dockerfile for building Yarn.
# docker build -t yarnpkg/dev -f Dockerfile.dev .

FROM yarnpkg/node-yarn:latest
MAINTAINER Daniel Lo Nigro <yarn@dan.cx>

# Debian packages
RUN apt-get -y update && \
apt-get install -y --no-install-recommends \
fakeroot \
lintian \
rpm \
ruby \
ruby-dev \
unzip \
&& \
apt-get clean && \
rm -rf /var/lib/apt/lists/*

# Ruby packages
RUN gem install fpm

### Custom apps
# ghr (just needed for releases, could probably be optional)
ADD https://github.com/tcnksm/ghr/releases/download/v0.5.0/ghr_v0.5.0_linux_amd64.zip /tmp/ghr.zip
RUN unzip /tmp/ghr.zip -d /usr/local/bin/ && rm /tmp/ghr.zip
14 changes: 14 additions & 0 deletions Dockerfile.node7
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Dockerfile for using Yarn along with Node.js 7.x
# docker build -t yarnpkg/node-yarn:latest -f Dockerfile.node7 .

FROM node:7
MAINTAINER Daniel Lo Nigro <yarn@dan.cx>

ADD https://dl.yarnpkg.com/debian/pubkey.gpg /tmp/yarn-pubkey.gpg
RUN apt-key add /tmp/yarn-pubkey.gpg && rm /tmp/yarn-pubkey.gpg
RUN echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list

RUN apt-get -y update && \
apt-get install -y --no-install-recommends yarn && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*

0 comments on commit 3463426

Please sign in to comment.