From 16e1f6d18b433b2f69375dfd3e491285b85d2fe6 Mon Sep 17 00:00:00 2001 From: murgatroid99 Date: Mon, 10 Jul 2017 11:08:59 -0700 Subject: Install Node 8 in artifact linux Dockerfiles --- tools/dockerfile/grpc_artifact_linux_x64/Dockerfile | 2 +- tools/dockerfile/grpc_artifact_linux_x86/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'tools/dockerfile') diff --git a/tools/dockerfile/grpc_artifact_linux_x64/Dockerfile b/tools/dockerfile/grpc_artifact_linux_x64/Dockerfile index c667655afb..36a3851367 100644 --- a/tools/dockerfile/grpc_artifact_linux_x64/Dockerfile +++ b/tools/dockerfile/grpc_artifact_linux_x64/Dockerfile @@ -49,7 +49,7 @@ RUN apt-get update && apt-key update && apt-get install -y \ # Install Node dependencies RUN touch .profile RUN curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.25.4/install.sh | bash -RUN /bin/bash -l -c "nvm install 4 && npm install -g node-pre-gyp" +RUN /bin/bash -l -c "nvm install 8 && npm install -g node-pre-gyp" ################## # Python dependencies diff --git a/tools/dockerfile/grpc_artifact_linux_x86/Dockerfile b/tools/dockerfile/grpc_artifact_linux_x86/Dockerfile index 79f230186f..0630e44a85 100644 --- a/tools/dockerfile/grpc_artifact_linux_x86/Dockerfile +++ b/tools/dockerfile/grpc_artifact_linux_x86/Dockerfile @@ -49,7 +49,7 @@ RUN apt-get update && apt-key update && apt-get install -y \ # Install Node dependencies RUN touch .profile RUN curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.25.4/install.sh | bash -RUN /bin/bash -l -c "nvm install 4 && npm install -g node-pre-gyp" +RUN /bin/bash -l -c "nvm install 8 && npm install -g node-pre-gyp" ################## # Python dependencies -- cgit v1.2.3 From e8b282f3c94f4c40aab922b6e66bf55922d9c5a4 Mon Sep 17 00:00:00 2001 From: murgatroid99 Date: Tue, 11 Jul 2017 14:55:33 -0700 Subject: Remove python setup from artifact linux Dockerfiles --- tools/dockerfile/grpc_artifact_linux_x64/Dockerfile | 12 ------------ tools/dockerfile/grpc_artifact_linux_x86/Dockerfile | 12 ------------ 2 files changed, 24 deletions(-) (limited to 'tools/dockerfile') diff --git a/tools/dockerfile/grpc_artifact_linux_x64/Dockerfile b/tools/dockerfile/grpc_artifact_linux_x64/Dockerfile index 36a3851367..0251b2b392 100644 --- a/tools/dockerfile/grpc_artifact_linux_x64/Dockerfile +++ b/tools/dockerfile/grpc_artifact_linux_x64/Dockerfile @@ -51,18 +51,6 @@ RUN touch .profile RUN curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.25.4/install.sh | bash RUN /bin/bash -l -c "nvm install 8 && npm install -g node-pre-gyp" -################## -# Python dependencies - -RUN apt-get update && apt-get install -y \ - python-all-dev \ - python3-all-dev \ - python-pip - -RUN pip install pip --upgrade -RUN pip install virtualenv -RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.2.0 - ################## # Ruby dependencies diff --git a/tools/dockerfile/grpc_artifact_linux_x86/Dockerfile b/tools/dockerfile/grpc_artifact_linux_x86/Dockerfile index 0630e44a85..2d179c8c45 100644 --- a/tools/dockerfile/grpc_artifact_linux_x86/Dockerfile +++ b/tools/dockerfile/grpc_artifact_linux_x86/Dockerfile @@ -51,18 +51,6 @@ RUN touch .profile RUN curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.25.4/install.sh | bash RUN /bin/bash -l -c "nvm install 8 && npm install -g node-pre-gyp" -################## -# Python dependencies - -RUN apt-get update && apt-get install -y \ - python-all-dev \ - python3-all-dev \ - python-pip - -RUN pip install pip --upgrade -RUN pip install virtualenv -RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.2.0 - ################## # Ruby dependencies -- cgit v1.2.3