Skip to content

Commit

Permalink
Install nodejs package from correct source (#18)
Browse files Browse the repository at this point in the history
In our dockcross-based images, the 'nodejs' package is available in
both default debian sources and nodesource. Debian's package does
not include npm.

Not sure what changed or when, but it's fixed by increasing the
priority of nodesource. This in turn revealed that we were
targeting the wrong debian version; should be bullseye instead of
buster.

Closes #17.
  • Loading branch information
vweevers authored Jul 30, 2021
1 parent 4b69593 commit 5d1e4dd
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 10 deletions.
8 changes: 6 additions & 2 deletions android-arm64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,14 @@ RUN apt-get -y update && \
git curl gnupg apt-transport-https \
&& \
curl -sSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \
echo "deb https://deb.nodesource.com/node_10.x buster main" | tee /etc/apt/sources.list.d/nodesource.list && \
echo "deb-src https://deb.nodesource.com/node_10.x buster main" | tee -a /etc/apt/sources.list.d/nodesource.list && \
echo "deb https://deb.nodesource.com/node_10.x bullseye main" | tee /etc/apt/sources.list.d/nodesource.list && \
echo "deb-src https://deb.nodesource.com/node_10.x bullseye main" | tee -a /etc/apt/sources.list.d/nodesource.list && \
echo Package: nodejs >> /etc/apt/preferences.d/preferences && \
echo Pin: origin deb.nodesource.com >> /etc/apt/preferences.d/preferences && \
echo Pin-Priority: 1000 >> /etc/apt/preferences.d/preferences && \
apt-get -y update && \
apt-get -y install nodejs && \
npm -v && \
rm -rf /var/lib/apt/lists/*

USER node
Expand Down
8 changes: 6 additions & 2 deletions android-armv7/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,14 @@ RUN apt-get -y update && \
git curl gnupg apt-transport-https \
&& \
curl -sSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \
echo "deb https://deb.nodesource.com/node_10.x buster main" | tee /etc/apt/sources.list.d/nodesource.list && \
echo "deb-src https://deb.nodesource.com/node_10.x buster main" | tee -a /etc/apt/sources.list.d/nodesource.list && \
echo "deb https://deb.nodesource.com/node_10.x bullseye main" | tee /etc/apt/sources.list.d/nodesource.list && \
echo "deb-src https://deb.nodesource.com/node_10.x bullseye main" | tee -a /etc/apt/sources.list.d/nodesource.list && \
echo Package: nodejs >> /etc/apt/preferences.d/preferences && \
echo Pin: origin deb.nodesource.com >> /etc/apt/preferences.d/preferences && \
echo Pin-Priority: 1000 >> /etc/apt/preferences.d/preferences && \
apt-get -y update && \
apt-get -y install nodejs && \
npm -v && \
rm -rf /var/lib/apt/lists/*

USER node
Expand Down
8 changes: 6 additions & 2 deletions linux-arm64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,14 @@ RUN apt-get -y update && \
git curl gnupg apt-transport-https \
&& \
curl -sSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \
echo "deb https://deb.nodesource.com/node_10.x buster main" | tee /etc/apt/sources.list.d/nodesource.list && \
echo "deb-src https://deb.nodesource.com/node_10.x buster main" | tee -a /etc/apt/sources.list.d/nodesource.list && \
echo "deb https://deb.nodesource.com/node_10.x bullseye main" | tee /etc/apt/sources.list.d/nodesource.list && \
echo "deb-src https://deb.nodesource.com/node_10.x bullseye main" | tee -a /etc/apt/sources.list.d/nodesource.list && \
echo Package: nodejs >> /etc/apt/preferences.d/preferences && \
echo Pin: origin deb.nodesource.com >> /etc/apt/preferences.d/preferences && \
echo Pin-Priority: 1000 >> /etc/apt/preferences.d/preferences && \
apt-get -y update && \
apt-get -y install nodejs && \
npm -v && \
rm -rf /var/lib/apt/lists/*

USER node
Expand Down
8 changes: 6 additions & 2 deletions linux-armv6/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,14 @@ RUN apt-get -y update && \
git curl gnupg apt-transport-https \
&& \
curl -sSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \
echo "deb https://deb.nodesource.com/node_10.x buster main" | tee /etc/apt/sources.list.d/nodesource.list && \
echo "deb-src https://deb.nodesource.com/node_10.x buster main" | tee -a /etc/apt/sources.list.d/nodesource.list && \
echo "deb https://deb.nodesource.com/node_10.x bullseye main" | tee /etc/apt/sources.list.d/nodesource.list && \
echo "deb-src https://deb.nodesource.com/node_10.x bullseye main" | tee -a /etc/apt/sources.list.d/nodesource.list && \
echo Package: nodejs >> /etc/apt/preferences.d/preferences && \
echo Pin: origin deb.nodesource.com >> /etc/apt/preferences.d/preferences && \
echo Pin-Priority: 1000 >> /etc/apt/preferences.d/preferences && \
apt-get -y update && \
apt-get -y install nodejs && \
npm -v && \
rm -rf /var/lib/apt/lists/*

USER node
Expand Down
8 changes: 6 additions & 2 deletions linux-armv7/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,14 @@ RUN apt-get -y update && \
git curl gnupg apt-transport-https \
&& \
curl -sSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \
echo "deb https://deb.nodesource.com/node_10.x buster main" | tee /etc/apt/sources.list.d/nodesource.list && \
echo "deb-src https://deb.nodesource.com/node_10.x buster main" | tee -a /etc/apt/sources.list.d/nodesource.list && \
echo "deb https://deb.nodesource.com/node_10.x bullseye main" | tee /etc/apt/sources.list.d/nodesource.list && \
echo "deb-src https://deb.nodesource.com/node_10.x bullseye main" | tee -a /etc/apt/sources.list.d/nodesource.list && \
echo Package: nodejs >> /etc/apt/preferences.d/preferences && \
echo Pin: origin deb.nodesource.com >> /etc/apt/preferences.d/preferences && \
echo Pin-Priority: 1000 >> /etc/apt/preferences.d/preferences && \
apt-get -y update && \
apt-get -y install nodejs && \
npm -v && \
rm -rf /var/lib/apt/lists/*

USER node
Expand Down

0 comments on commit 5d1e4dd

Please sign in to comment.