Repository: thrift Updated Branches: refs/heads/master 0a660ee28 -> ec50ae0ed
THRIFT-4041: add ocaml and oasis to ubuntu and debian docker build images Client: OCaml This closes #1190 Project: http://git-wip-us.apache.org/repos/asf/thrift/repo Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/ec50ae0e Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/ec50ae0e Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/ec50ae0e Branch: refs/heads/master Commit: ec50ae0ed59c06658da11d2ed54e1681a4ef5a3a Parents: 0a660ee Author: James E. King, III <jk...@apache.org> Authored: Tue Feb 14 16:12:11 2017 -0500 Committer: James E. King, III <jk...@apache.org> Committed: Tue Feb 14 16:12:11 2017 -0500 ---------------------------------------------------------------------- build/docker/debian/Dockerfile | 9 +++++++++ build/docker/ubuntu/Dockerfile | 10 ++++++++++ 2 files changed, 19 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/thrift/blob/ec50ae0e/build/docker/debian/Dockerfile ---------------------------------------------------------------------- diff --git a/build/docker/debian/Dockerfile b/build/docker/debian/Dockerfile index 7c15109..9a16951 100644 --- a/build/docker/debian/Dockerfile +++ b/build/docker/debian/Dockerfile @@ -183,6 +183,15 @@ RUN curl -sSL http://downloads.dlang.org/releases/2.x/2.070.0/dmd_2.070.0-0_amd6 # Dart ENV PATH /usr/lib/dart/bin:$PATH +# OCaml +RUN echo 'deb http://ppa.launchpad.net/avsm/ppa/ubuntu trusty main' > /etc/apt/sources.list.d/avsm-official-ocaml.list && \ + gpg --keyserver keyserver.ubuntu.com --recv 61707B09 && \ + gpg --export --armor 61707B09 | apt-key add - && \ + apt-get update && \ + apt-get install -y ocaml opam && \ + opam init && \ + opam install oasis + # Force utf8 locale to successfully build Haskell tf-random ENV LC_ALL C.UTF-8 http://git-wip-us.apache.org/repos/asf/thrift/blob/ec50ae0e/build/docker/ubuntu/Dockerfile ---------------------------------------------------------------------- diff --git a/build/docker/ubuntu/Dockerfile b/build/docker/ubuntu/Dockerfile index 02f0b1e..b6cebb3 100644 --- a/build/docker/ubuntu/Dockerfile +++ b/build/docker/ubuntu/Dockerfile @@ -203,6 +203,16 @@ RUN curl -sSL http://downloads.dlang.org/releases/2.x/2.070.0/dmd_2.070.0-0_amd6 # Dart ENV PATH /usr/lib/dart/bin:$PATH +# OCaml +RUN echo 'deb http://ppa.launchpad.net/avsm/ppa/ubuntu trusty main' > /etc/apt/sources.list.d/avsm-official-ocaml.list && \ + gpg --keyserver keyserver.ubuntu.com --recv 61707B09 && \ + gpg --export --armor 61707B09 | apt-key add - && \ + apt-get update && \ + apt-get install -y ocaml opam && \ + opam init && \ + opam install oasis + + ENV THRIFT_ROOT /thrift RUN mkdir -p $THRIFT_ROOT/src COPY Dockerfile $THRIFT_ROOT/