diff options
| author |  Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2018-10-01 19:29:38 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-10-01 19:29:38 +0200 |
| commit | bea8c3018cdb7cebe25884412079d54ce47655dd (patch) | |
| tree | 2bc2f84cf5b705d4957ba277ecfcc51634989c40 | |
| parent | 4536678af117f96663fa2fae912fe45f40947ca7 (diff) | |
| parent | 67d219a88434d98bda1d284f9147290e75324519 (diff) | |
Merge pull request #16747 from jtattermusch/cleanup_artifact_dockerfiles
Fix and polish artifact dockerfiles (and make them buildable again)
| -rw-r--r-- | tools/dockerfile/grpc_artifact_linux_x64/Dockerfile | 18 | ||||
| -rw-r--r-- | tools/dockerfile/grpc_artifact_linux_x86/Dockerfile | 9 |
2 files changed, 3 insertions, 24 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 diff --git a/tools/dockerfile/grpc_artifact_linux_x86/Dockerfile b/tools/dockerfile/grpc_artifact_linux_x86/Dockerfile index 2d179c8c45..d33e0f83ea 100644 --- a/tools/dockerfile/grpc_artifact_linux_x86/Dockerfile +++ b/tools/dockerfile/grpc_artifact_linux_x86/Dockerfile @@ -16,10 +16,8 @@ FROM 32bit/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 |