From 8334bbd01ec00f965869f40215aa474d84a7290e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kr=C3=A6n=20Hansen?= Date: Tue, 15 Aug 2017 11:52:51 +0200 Subject: [PATCH] Revert "Use NVM and the same version of Node+NPM as ./scripts/test.sh" This reverts commit a0649d1f0a6ccf15bc1df5c7119bd6f29b777694. --- Dockerfile | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/Dockerfile b/Dockerfile index 951cf6a4..05162f77 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,6 +30,8 @@ RUN dpkg --add-architecture i386 && \ unzip \ wget \ zip && \ + curl -sL https://deb.nodesource.com/setup_4.x | bash - && \ + apt-get install -y nodejs && \ echo oracle-java6-installer shared/accepted-oracle-license-v1-1 select true | debconf-set-selections && \ add-apt-repository -y ppa:webupd8team/java && \ apt-get update -qq && \ @@ -37,21 +39,6 @@ RUN dpkg --add-architecture i386 && \ rm -rf /var/cache/oracle-jdk8-installer && \ apt-get clean -# Install NVM (based on https://stackoverflow.com/questions/25899912/install-nvm-in-docker) - -ENV NVM_DIR /usr/local/nvm -ENV NODE_VERSION 6.5.0 - -# Install nvm with node and npm -RUN curl https://raw.githubusercontent.com/creationix/nvm/v0.33.2/install.sh | bash \ - && . $NVM_DIR/nvm.sh \ - && nvm install $NODE_VERSION \ - && nvm alias default $NODE_VERSION \ - && nvm use default - -ENV NODE_PATH $NVM_DIR/v$NODE_VERSION/lib/node_modules -ENV PATH $NVM_DIR/v$NODE_VERSION/bin:$PATH - ENV NPM_CONFIG_UNSAFE_PERM true # Locales @@ -86,4 +73,4 @@ RUN cd /opt && \ ./autogen.sh && ./configure && \ make && make install -RUN . $NVM_DIR/nvm.sh && nvm use default && npm install -g react-native-cli +RUN npm install -g react-native-cli