diff options
| author | Sara Aimée Smiseth <51710585+SaraSmiseth@users.noreply.github.com> | 2020-02-16 11:54:57 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-16 12:54:57 +0100 |
| commit | 250ca99cb5d9f0492c93f30e247d441cb4fe5ccf (patch) | |
| tree | 4674b4711bc2283b5f20ff1debd7cba0dc0ad63c | |
| parent | cb28f61a6cf80dd461852b821d1ed3b3467fa89e (diff) | |
Fix non-x64 architectures not being able to build Docker image because of hardcoded Node.js architecture (#13081)
* Use ARCH variable instead of hardcoded x64 * fix formating
| -rw-r--r-- | Dockerfile | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/Dockerfile b/Dockerfile index 16618a276..a22efe672 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,14 +5,25 @@ SHELL ["bash", "-c"] # Install Node v12 (LTS) ENV NODE_VER="12.14.0" -RUN echo "Etc/UTC" > /etc/localtime && \ +RUN ARCH= && \ + dpkgArch="$(dpkg --print-architecture)" && \ + case "${dpkgArch##*-}" in \ + amd64) ARCH='x64';; \ + ppc64el) ARCH='ppc64le';; \ + s390x) ARCH='s390x';; \ + arm64) ARCH='arm64';; \ + armhf) ARCH='armv7l';; \ + i386) ARCH='x86';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac && \ + echo "Etc/UTC" > /etc/localtime && \ apt update && \ apt -y install wget python && \ cd ~ && \ - wget https://nodejs.org/download/release/v$NODE_VER/node-v$NODE_VER-linux-x64.tar.gz && \ - tar xf node-v$NODE_VER-linux-x64.tar.gz && \ - rm node-v$NODE_VER-linux-x64.tar.gz && \ - mv node-v$NODE_VER-linux-x64 /opt/node + wget https://nodejs.org/download/release/v$NODE_VER/node-v$NODE_VER-linux-$ARCH.tar.gz && \ + tar xf node-v$NODE_VER-linux-$ARCH.tar.gz && \ + rm node-v$NODE_VER-linux-$ARCH.tar.gz && \ + mv node-v$NODE_VER-linux-$ARCH /opt/node # Install jemalloc ENV JE_VER="5.2.1" |