diff options
| author | James E. King, III <jking@apache.org> | 2017-02-14 16:12:11 -0500 |
|---|---|---|
| committer | James E. King, III <jking@apache.org> | 2017-02-14 16:12:11 -0500 |
| commit | ec50ae0ed59c06658da11d2ed54e1681a4ef5a3a (patch) | |
| tree | a0eaeea911075cf78b53cd55c13299ddd97b90de | |
| parent | 0a660ee285e4a4cbac8f702168c40fd4ef5495d1 (diff) | |
| download | thrift-ec50ae0ed59c06658da11d2ed54e1681a4ef5a3a.tar.gz | |
THRIFT-4041: add ocaml and oasis to ubuntu and debian docker build images
Client: OCaml
This closes #1190
| -rw-r--r-- | build/docker/debian/Dockerfile | 9 | ||||
| -rw-r--r-- | build/docker/ubuntu/Dockerfile | 10 |
2 files changed, 19 insertions, 0 deletions
diff --git a/build/docker/debian/Dockerfile b/build/docker/debian/Dockerfile index 7c151091e..9a169516c 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 diff --git a/build/docker/ubuntu/Dockerfile b/build/docker/ubuntu/Dockerfile index 02f0b1e5d..b6cebb3ea 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/ |