From 64d3abaa2440c12ad158e3b171508d3e3989de54 Mon Sep 17 00:00:00 2001 From: Anton Kochkov Date: Thu, 14 Nov 2019 12:25:31 -0800 Subject: [PATCH] [infer][PR] Update opam in Dockerfiles Summary: A small nitpick Pull Request resolved: https://github.com/facebook/infer/pull/1183 Differential Revision: D18512026 Pulled By: jvillard fbshipit-source-id: 027cba11f --- docker/master-java/Dockerfile | 2 +- docker/master/Dockerfile | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker/master-java/Dockerfile b/docker/master-java/Dockerfile index 05a2640f8..9ad9620d0 100644 --- a/docker/master-java/Dockerfile +++ b/docker/master-java/Dockerfile @@ -30,7 +30,7 @@ RUN apt-get update && \ RUN cd /usr/local/bin && ln -s /usr/bin/python2.7 python # Install opam 2 -RUN curl -sL https://github.com/ocaml/opam/releases/download/2.0.2/opam-2.0.2-x86_64-linux > /usr/bin/opam && \ +RUN curl -sL https://github.com/ocaml/opam/releases/download/2.0.5/opam-2.0.5-x86_64-linux > /usr/bin/opam && \ chmod +x /usr/bin/opam # Disable sandboxing diff --git a/docker/master/Dockerfile b/docker/master/Dockerfile index a1f67e406..d865c5f35 100644 --- a/docker/master/Dockerfile +++ b/docker/master/Dockerfile @@ -34,7 +34,7 @@ RUN apt-get update && \ RUN cd /usr/local/bin && ln -s /usr/bin/python2.7 python # Install opam 2 -RUN curl -sL https://github.com/ocaml/opam/releases/download/2.0.3/opam-2.0.3-x86_64-linux > /usr/bin/opam && \ +RUN curl -sL https://github.com/ocaml/opam/releases/download/2.0.5/opam-2.0.5-x86_64-linux > /usr/bin/opam && \ chmod +x /usr/bin/opam # Disable sandboxing @@ -56,14 +56,14 @@ RUN cd /infer && \ ./facebook-clang-plugins/clang/setup.sh # Generate a release -RUN cd /infer && \ +RUN cd /infer && \ make install-with-libs \ - BUILD_MODE=opt \ + BUILD_MODE=opt \ PATCHELF=patchelf \ - DESTDIR="/infer-release" \ + DESTDIR="/infer-release" \ libdir_relative_to_bindir="../lib" -FROM debian:stretch-slim AS executor +FROM debian:stretch-slim AS executor # Install python 2.7 since infer requires it to run RUN apt-get update && apt-get install --yes --no-install-recommends \