Skip to content

Commit aee37be

Browse files
authored
Merge pull request #371 from betatim/install-npm
[MRG] Fix up node install and add test
2 parents 465177c + 4af5c61 commit aee37be

File tree

4 files changed

+13
-6
lines changed

4 files changed

+13
-6
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ jobs:
3535
branch: master
3636
env:
3737
matrix:
38+
- REPO_TYPE=base
3839
- REPO_TYPE=conda
3940
- REPO_TYPE=venv
4041
- REPO_TYPE=stencila

repo2docker/buildpacks/base.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@
4343
${NB_USER}
4444
WORKDIR ${HOME}
4545
46-
RUN wget --quiet -O - https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \
47-
DISTRO="$(lsb_release -s -c)" \
48-
echo "deb https://deb.nodesource.com/$VERSION $DISTRO main" | tee /etc/apt/sources.list.d/nodesource.list \
49-
echo "deb-src https://deb.nodesource.com/$VERSION $DISTRO main" | tee -a /etc/apt/sources.list.d/nodesource.list
46+
RUN wget --quiet -O - https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \
47+
DISTRO="bionic" && \
48+
echo "deb https://deb.nodesource.com/node_10.x $DISTRO main" >> /etc/apt/sources.list.d/nodesource.list && \
49+
echo "deb-src https://deb.nodesource.com/node_10.x $DISTRO main" >> /etc/apt/sources.list.d/nodesource.list
5050
5151
RUN apt-get update && \
5252
apt-get install --yes --no-install-recommends \
@@ -187,9 +187,7 @@ def get_base_packages(self):
187187
return {
188188
# Utils!
189189
"less",
190-
191190
"nodejs",
192-
193191
"unzip",
194192
}
195193

tests/base/node10/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Test that node 10 is installed and runnable.

tests/base/node10/verify

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/bin/sh
2+
3+
set -e
4+
which node
5+
node --version | grep v10
6+
which npm
7+
npm --version | grep 6.2

0 commit comments

Comments
 (0)