From 5ad063e3ba340743e394114d3038d0fd4e0fe570 Mon Sep 17 00:00:00 2001 From: Christopher Horrell Date: Fri, 3 Jun 2016 11:13:59 -0400 Subject: [PATCH] Add symlink to nodejs. Fixes #181 This adds compatibility with the Debian/Ubuntu packages that assume a 'nodejs' binary --- 0.10/Dockerfile | 3 ++- 0.10/slim/Dockerfile | 3 ++- 0.10/wheezy/Dockerfile | 3 ++- 0.12/Dockerfile | 3 ++- 0.12/slim/Dockerfile | 3 ++- 0.12/wheezy/Dockerfile | 3 ++- 4.5/Dockerfile | 3 ++- 4.5/slim/Dockerfile | 3 ++- 4.5/wheezy/Dockerfile | 3 ++- 5.12/Dockerfile | 3 ++- 5.12/slim/Dockerfile | 3 ++- 5.12/wheezy/Dockerfile | 3 ++- 6.4/Dockerfile | 3 ++- 6.4/slim/Dockerfile | 3 ++- 6.4/wheezy/Dockerfile | 3 ++- Dockerfile-slim.template | 3 ++- Dockerfile-wheezy.template | 3 ++- Dockerfile.template | 3 ++- 18 files changed, 36 insertions(+), 18 deletions(-) diff --git a/0.10/Dockerfile b/0.10/Dockerfile index f25439dc..08200747 100644 --- a/0.10/Dockerfile +++ b/0.10/Dockerfile @@ -22,6 +22,7 @@ RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux- && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ && grep " node-v$NODE_VERSION-linux-x64.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-x64.tar.xz" -C /usr/local --strip-components=1 \ - && rm "node-v$NODE_VERSION-linux-x64.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt + && rm "node-v$NODE_VERSION-linux-x64.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs CMD [ "node" ] diff --git a/0.10/slim/Dockerfile b/0.10/slim/Dockerfile index e5907596..a7655a18 100644 --- a/0.10/slim/Dockerfile +++ b/0.10/slim/Dockerfile @@ -27,6 +27,7 @@ RUN buildDeps='xz-utils' \ && grep " node-v$NODE_VERSION-linux-x64.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-x64.tar.xz" -C /usr/local --strip-components=1 \ && rm "node-v$NODE_VERSION-linux-x64.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && apt-get purge -y --auto-remove $buildDeps + && apt-get purge -y --auto-remove $buildDeps \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs CMD [ "node" ] diff --git a/0.10/wheezy/Dockerfile b/0.10/wheezy/Dockerfile index 8234f884..daac8f97 100644 --- a/0.10/wheezy/Dockerfile +++ b/0.10/wheezy/Dockerfile @@ -22,6 +22,7 @@ RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux- && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ && grep " node-v$NODE_VERSION-linux-x64.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-x64.tar.xz" -C /usr/local --strip-components=1 \ - && rm "node-v$NODE_VERSION-linux-x64.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt + && rm "node-v$NODE_VERSION-linux-x64.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs CMD [ "node" ] diff --git a/0.12/Dockerfile b/0.12/Dockerfile index 728d6c45..c67e3021 100644 --- a/0.12/Dockerfile +++ b/0.12/Dockerfile @@ -22,6 +22,7 @@ RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux- && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ && grep " node-v$NODE_VERSION-linux-x64.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-x64.tar.xz" -C /usr/local --strip-components=1 \ - && rm "node-v$NODE_VERSION-linux-x64.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt + && rm "node-v$NODE_VERSION-linux-x64.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs CMD [ "node" ] diff --git a/0.12/slim/Dockerfile b/0.12/slim/Dockerfile index 197c972b..188cefd0 100644 --- a/0.12/slim/Dockerfile +++ b/0.12/slim/Dockerfile @@ -27,6 +27,7 @@ RUN buildDeps='xz-utils' \ && grep " node-v$NODE_VERSION-linux-x64.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-x64.tar.xz" -C /usr/local --strip-components=1 \ && rm "node-v$NODE_VERSION-linux-x64.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && apt-get purge -y --auto-remove $buildDeps + && apt-get purge -y --auto-remove $buildDeps \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs CMD [ "node" ] diff --git a/0.12/wheezy/Dockerfile b/0.12/wheezy/Dockerfile index c19b9972..d0e2a649 100644 --- a/0.12/wheezy/Dockerfile +++ b/0.12/wheezy/Dockerfile @@ -22,6 +22,7 @@ RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux- && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ && grep " node-v$NODE_VERSION-linux-x64.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-x64.tar.xz" -C /usr/local --strip-components=1 \ - && rm "node-v$NODE_VERSION-linux-x64.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt + && rm "node-v$NODE_VERSION-linux-x64.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs CMD [ "node" ] diff --git a/4.5/Dockerfile b/4.5/Dockerfile index a843879a..e0ef6ae2 100644 --- a/4.5/Dockerfile +++ b/4.5/Dockerfile @@ -23,6 +23,7 @@ RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux- && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ && grep " node-v$NODE_VERSION-linux-x64.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-x64.tar.xz" -C /usr/local --strip-components=1 \ - && rm "node-v$NODE_VERSION-linux-x64.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt + && rm "node-v$NODE_VERSION-linux-x64.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs CMD [ "node" ] diff --git a/4.5/slim/Dockerfile b/4.5/slim/Dockerfile index 467a937b..e9ccd49e 100644 --- a/4.5/slim/Dockerfile +++ b/4.5/slim/Dockerfile @@ -28,6 +28,7 @@ RUN buildDeps='xz-utils' \ && grep " node-v$NODE_VERSION-linux-x64.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-x64.tar.xz" -C /usr/local --strip-components=1 \ && rm "node-v$NODE_VERSION-linux-x64.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && apt-get purge -y --auto-remove $buildDeps + && apt-get purge -y --auto-remove $buildDeps \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs CMD [ "node" ] diff --git a/4.5/wheezy/Dockerfile b/4.5/wheezy/Dockerfile index 49fc34af..4cdcc0e1 100644 --- a/4.5/wheezy/Dockerfile +++ b/4.5/wheezy/Dockerfile @@ -23,6 +23,7 @@ RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux- && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ && grep " node-v$NODE_VERSION-linux-x64.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-x64.tar.xz" -C /usr/local --strip-components=1 \ - && rm "node-v$NODE_VERSION-linux-x64.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt + && rm "node-v$NODE_VERSION-linux-x64.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs CMD [ "node" ] diff --git a/5.12/Dockerfile b/5.12/Dockerfile index 34bd7ae8..d269e9f0 100644 --- a/5.12/Dockerfile +++ b/5.12/Dockerfile @@ -23,6 +23,7 @@ RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux- && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ && grep " node-v$NODE_VERSION-linux-x64.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-x64.tar.xz" -C /usr/local --strip-components=1 \ - && rm "node-v$NODE_VERSION-linux-x64.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt + && rm "node-v$NODE_VERSION-linux-x64.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs CMD [ "node" ] diff --git a/5.12/slim/Dockerfile b/5.12/slim/Dockerfile index f1d83ce0..37d36d85 100644 --- a/5.12/slim/Dockerfile +++ b/5.12/slim/Dockerfile @@ -28,6 +28,7 @@ RUN buildDeps='xz-utils' \ && grep " node-v$NODE_VERSION-linux-x64.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-x64.tar.xz" -C /usr/local --strip-components=1 \ && rm "node-v$NODE_VERSION-linux-x64.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && apt-get purge -y --auto-remove $buildDeps + && apt-get purge -y --auto-remove $buildDeps \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs CMD [ "node" ] diff --git a/5.12/wheezy/Dockerfile b/5.12/wheezy/Dockerfile index 17526714..5af274e7 100644 --- a/5.12/wheezy/Dockerfile +++ b/5.12/wheezy/Dockerfile @@ -23,6 +23,7 @@ RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux- && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ && grep " node-v$NODE_VERSION-linux-x64.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-x64.tar.xz" -C /usr/local --strip-components=1 \ - && rm "node-v$NODE_VERSION-linux-x64.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt + && rm "node-v$NODE_VERSION-linux-x64.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs CMD [ "node" ] diff --git a/6.4/Dockerfile b/6.4/Dockerfile index 0a678e58..be8c4de3 100644 --- a/6.4/Dockerfile +++ b/6.4/Dockerfile @@ -23,6 +23,7 @@ RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux- && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ && grep " node-v$NODE_VERSION-linux-x64.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-x64.tar.xz" -C /usr/local --strip-components=1 \ - && rm "node-v$NODE_VERSION-linux-x64.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt + && rm "node-v$NODE_VERSION-linux-x64.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs CMD [ "node" ] diff --git a/6.4/slim/Dockerfile b/6.4/slim/Dockerfile index 4345a206..cc165dbf 100644 --- a/6.4/slim/Dockerfile +++ b/6.4/slim/Dockerfile @@ -28,6 +28,7 @@ RUN buildDeps='xz-utils' \ && grep " node-v$NODE_VERSION-linux-x64.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-x64.tar.xz" -C /usr/local --strip-components=1 \ && rm "node-v$NODE_VERSION-linux-x64.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && apt-get purge -y --auto-remove $buildDeps + && apt-get purge -y --auto-remove $buildDeps \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs CMD [ "node" ] diff --git a/6.4/wheezy/Dockerfile b/6.4/wheezy/Dockerfile index b2283b08..31378ee0 100644 --- a/6.4/wheezy/Dockerfile +++ b/6.4/wheezy/Dockerfile @@ -23,6 +23,7 @@ RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux- && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ && grep " node-v$NODE_VERSION-linux-x64.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-x64.tar.xz" -C /usr/local --strip-components=1 \ - && rm "node-v$NODE_VERSION-linux-x64.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt + && rm "node-v$NODE_VERSION-linux-x64.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs CMD [ "node" ] diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template index 6a3cafed..6988fc39 100644 --- a/Dockerfile-slim.template +++ b/Dockerfile-slim.template @@ -28,6 +28,7 @@ RUN buildDeps='xz-utils' \ && grep " node-v$NODE_VERSION-linux-x64.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-x64.tar.xz" -C /usr/local --strip-components=1 \ && rm "node-v$NODE_VERSION-linux-x64.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ - && apt-get purge -y --auto-remove $buildDeps + && apt-get purge -y --auto-remove $buildDeps \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs CMD [ "node" ] diff --git a/Dockerfile-wheezy.template b/Dockerfile-wheezy.template index 2582c498..51a7d5cd 100644 --- a/Dockerfile-wheezy.template +++ b/Dockerfile-wheezy.template @@ -23,6 +23,7 @@ RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux- && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ && grep " node-v$NODE_VERSION-linux-x64.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-x64.tar.xz" -C /usr/local --strip-components=1 \ - && rm "node-v$NODE_VERSION-linux-x64.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt + && rm "node-v$NODE_VERSION-linux-x64.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs CMD [ "node" ] diff --git a/Dockerfile.template b/Dockerfile.template index 748585dd..a3181ddf 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -23,6 +23,7 @@ RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux- && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ && grep " node-v$NODE_VERSION-linux-x64.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ && tar -xJf "node-v$NODE_VERSION-linux-x64.tar.xz" -C /usr/local --strip-components=1 \ - && rm "node-v$NODE_VERSION-linux-x64.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt + && rm "node-v$NODE_VERSION-linux-x64.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs CMD [ "node" ]