diff options
author | 2018-10-01 17:04:52 +0200 | |
---|---|---|
committer | 2018-10-01 17:33:42 +0200 | |
commit | b23cfa2f3e80cea9bd1a3dcc35607f455347976f (patch) | |
tree | d7df8e3d672e31711ee52d831374e91755b94852 /tools/dockerfile/grpc_artifact_linux_x64/Dockerfile | |
parent | 92b45c8eefcdde5e0c0ec36373fdecb7cd7007d7 (diff) |
fix and polish artifact dockerfiles
Diffstat (limited to 'tools/dockerfile/grpc_artifact_linux_x64/Dockerfile')
-rw-r--r-- | tools/dockerfile/grpc_artifact_linux_x64/Dockerfile | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/tools/dockerfile/grpc_artifact_linux_x64/Dockerfile b/tools/dockerfile/grpc_artifact_linux_x64/Dockerfile index 0251b2b392..228efef698 100644 --- a/tools/dockerfile/grpc_artifact_linux_x64/Dockerfile +++ b/tools/dockerfile/grpc_artifact_linux_x64/Dockerfile @@ -16,10 +16,8 @@ FROM debian:jessie -RUN apt-get update && apt-get install debian-keyring && apt-key update - # Install Git and basic packages. -RUN apt-get update && apt-key update && apt-get install -y \ +RUN apt-get update && apt-get install -y \ autoconf \ autotools-dev \ build-essential \ @@ -46,11 +44,6 @@ RUN apt-get update && apt-key update && apt-get install -y \ wget \ zip && apt-get clean -# 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 8 && npm install -g node-pre-gyp" - ################## # Ruby dependencies @@ -72,15 +65,8 @@ RUN /bin/bash -l -c "gem install bundler --no-ri --no-rdoc" # PHP dependencies RUN apt-get update && apt-get install -y \ - php5 php5-dev php-pear phpunit - -################## -# Install cross compiler for ARM - -RUN echo 'deb http://emdebian.org/tools/debian/ jessie main' | tee -a /etc/apt/sources.list.d/crosstools.list && \ - curl http://emdebian.org/tools/debian/emdebian-toolchain-archive.key | apt-key add - + php5 php5-dev php-pear phpunit && apt-get clean -RUN dpkg --add-architecture armhf && apt-get update && apt-get install -y crossbuild-essential-armhf RUN mkdir /var/local/jenkins |