You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by ns...@apache.org on 2016/09/04 09:50:33 UTC
[06/10] thrift git commit: THRIFT-3908 Remove redundant dependencies
from Dockerfile
THRIFT-3908 Remove redundant dependencies from Dockerfile
This closes #1071
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/080041c3
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/080041c3
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/080041c3
Branch: refs/heads/master
Commit: 080041c3855fdcdd372240e6a4c4deb5e2da16a9
Parents: 88c5ee7
Author: Nobuaki Sukegawa <ns...@apache.org>
Authored: Sun Sep 4 18:49:19 2016 +0900
Committer: Nobuaki Sukegawa <ns...@apache.org>
Committed: Sun Sep 4 18:49:19 2016 +0900
----------------------------------------------------------------------
build/docker/debian/Dockerfile | 10 ++--------
build/docker/ubuntu/Dockerfile | 10 ++--------
2 files changed, 4 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/080041c3/build/docker/debian/Dockerfile
----------------------------------------------------------------------
diff --git a/build/docker/debian/Dockerfile b/build/docker/debian/Dockerfile
index 5ec956e..22dd3b5 100644
--- a/build/docker/debian/Dockerfile
+++ b/build/docker/debian/Dockerfile
@@ -121,10 +121,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
RUN apt-get update && apt-get install -y --no-install-recommends \
`# CSharp dependencies` \
libmono-system-web2.0-cil \
- mono-complete \
- mono-devel \
- mono-gmcs \
- mono-xbuild
+ mono-devel
RUN apt-get update && apt-get install -y --no-install-recommends \
`# D dependencies` \
@@ -145,11 +142,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
rm -rf /tmp/* && \
rm -rf /var/tmp/*
-# Java
-RUN update-java-alternatives -s java-1.7.0-openjdk-amd64
-
# Ruby
-RUN gem install bundler rake
+RUN gem install bundler --no-ri --no-rdoc
# Go
RUN curl -sSL https://storage.googleapis.com/golang/go1.4.3.linux-amd64.tar.gz | tar -C /usr/local/ -xz
http://git-wip-us.apache.org/repos/asf/thrift/blob/080041c3/build/docker/ubuntu/Dockerfile
----------------------------------------------------------------------
diff --git a/build/docker/ubuntu/Dockerfile b/build/docker/ubuntu/Dockerfile
index 4f09538..99f0a8f 100644
--- a/build/docker/ubuntu/Dockerfile
+++ b/build/docker/ubuntu/Dockerfile
@@ -139,10 +139,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
RUN apt-get update && apt-get install -y --no-install-recommends \
`# CSharp dependencies` \
libmono-system-web2.0-cil \
- mono-complete \
- mono-devel \
- mono-gmcs \
- mono-xbuild
+ mono-devel
RUN apt-get update && apt-get install -y --no-install-recommends \
`# D dependencies` \
@@ -163,11 +160,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
rm -rf /tmp/* && \
rm -rf /var/tmp/*
-# Java
-RUN update-java-alternatives -s java-1.7.0-openjdk-amd64
-
# Ruby
-RUN gem install bundler rake
+RUN gem install bundler --no-ri --no-rdoc
# Go
RUN curl -sSL https://storage.googleapis.com/golang/go1.4.3.linux-amd64.tar.gz | tar -C /usr/local/ -xz