[llvm] r311890 - Changed Dockerfiles to install LLVM into /usr/local

Ilya Biryukov via llvm-commits llvm-commits at lists.llvm.org
Mon Aug 28 08:12:24 PDT 2017


Author: ibiryukov
Date: Mon Aug 28 08:12:24 2017
New Revision: 311890

URL: http://llvm.org/viewvc/llvm-project?rev=311890&view=rev
Log:
Changed Dockerfiles to install LLVM into /usr/local

Summary:
Previously, the installation path was simply '/'.
Using '/usr/local' would ensure that LLVM installation does not
conflict with software installed via package managers.

Reviewers: mehdi_amini, klimek

Reviewed By: klimek

Subscribers: llvm-commits

Differential Revision: https://reviews.llvm.org/D37213

Modified:
    llvm/trunk/utils/docker/debian8/release/Dockerfile
    llvm/trunk/utils/docker/example/release/Dockerfile
    llvm/trunk/utils/docker/nvidia-cuda/release/Dockerfile

Modified: llvm/trunk/utils/docker/debian8/release/Dockerfile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/docker/debian8/release/Dockerfile?rev=311890&r1=311889&r2=311890&view=diff
==============================================================================
--- llvm/trunk/utils/docker/debian8/release/Dockerfile (original)
+++ llvm/trunk/utils/docker/debian8/release/Dockerfile Mon Aug 28 08:12:24 2017
@@ -18,4 +18,4 @@ RUN apt-get update && \
     rm -rf /var/lib/apt/lists/*
 
 # Unpack clang installation into this image.
-ADD clang.tar.gz /
+ADD clang.tar.gz /usr/local/

Modified: llvm/trunk/utils/docker/example/release/Dockerfile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/docker/example/release/Dockerfile?rev=311890&r1=311889&r2=311890&view=diff
==============================================================================
--- llvm/trunk/utils/docker/example/release/Dockerfile (original)
+++ llvm/trunk/utils/docker/example/release/Dockerfile Mon Aug 28 08:12:24 2017
@@ -21,4 +21,4 @@ LABEL maintainer "Maintainer <maintainer
 
 # Unpack clang installation into this container.
 # It is copied to this directory by build_docker_image.sh script.
-ADD clang.tar.gz /
+ADD clang.tar.gz /usr/local/

Modified: llvm/trunk/utils/docker/nvidia-cuda/release/Dockerfile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/docker/nvidia-cuda/release/Dockerfile?rev=311890&r1=311889&r2=311890&view=diff
==============================================================================
--- llvm/trunk/utils/docker/nvidia-cuda/release/Dockerfile (original)
+++ llvm/trunk/utils/docker/nvidia-cuda/release/Dockerfile Mon Aug 28 08:12:24 2017
@@ -18,6 +18,6 @@ FROM nvidia/cuda:8.0-devel
 LABEL maintainer "LLVM Developers"
 
 # Unpack clang installation into this container.
-ADD clang.tar.gz /
+ADD clang.tar.gz /usr/local/
 
 # C++ standard library and binutils are already included in the base package.




More information about the llvm-commits mailing list