Skip to content

Commit 5a5cdca

Browse files
authored
Merge pull request #90: Install Node.js version 14
2 parents 6a5b942 + d023279 commit 5a5cdca

1 file changed

Lines changed: 12 additions & 5 deletions

File tree

Dockerfile

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,13 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
2121
jq \
2222
libgmp-dev \
2323
libpng-dev \
24-
nodejs \
25-
npm \
2624
pkg-config
2725

26+
# Install a specific Node.js version
27+
# https://github.com/nodesource/distributions/blob/0d81da75/README.md#installation-instructions
28+
RUN curl -fsSL https://deb.nodesource.com/setup_14.x | bash - \
29+
&& apt-get install -y nodejs
30+
2831
# Downloading dependencies, these should be pinned to specific versions
2932

3033
# mafft
@@ -140,14 +143,18 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
140143
gzip \
141144
jq \
142145
less \
143-
nodejs \
144146
perl \
145147
ruby \
146148
wget \
147149
xz-utils \
148150
zip unzip \
149151
zstd
150152

153+
# Install a specific Node.js version
154+
# https://github.com/nodesource/distributions/blob/0d81da75/README.md#installation-instructions
155+
RUN curl -fsSL https://deb.nodesource.com/setup_14.x | bash - \
156+
&& apt-get install -y nodejs
157+
151158
# Configure bash for interactive usage
152159
COPY bashrc /etc/bash.bashrc
153160

@@ -228,15 +235,15 @@ COPY --from=builder \
228235
/usr/local/bin/
229236

230237
# Add installed Node libs
231-
COPY --from=builder /usr/local/lib/node_modules/ /usr/local/lib/node_modules/
238+
COPY --from=builder /usr/lib/node_modules/ /usr/lib/node_modules/
232239

233240
# Add globally linked Auspice script.
234241
#
235242
# This symlink is present in the "builder" image, but using COPY results in the
236243
# _contents_ of the target being copied instead of a symlink being created.
237244
# The symlink is required so that Auspice's locally-installed deps are
238245
# correctly discovered by node.
239-
RUN ln -sv /usr/local/lib/node_modules/auspice/auspice.js /usr/local/bin/auspice
246+
RUN ln -sv /usr/lib/node_modules/auspice/auspice.js /usr/local/bin/auspice
240247

241248
# Add Nextstrain components
242249
COPY --from=builder /nextstrain /nextstrain

0 commit comments

Comments
 (0)