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

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@311890 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/utils/docker/debian8/release/Dockerfile b/utils/docker/debian8/release/Dockerfile
index 03f027a779aa10a134194d32e407a0711b3dbe89..3a44a7d4116676be6fe393247a5265f44e8d3527 100644 (file)
--- a/utils/docker/debian8/release/Dockerfile
+++ b/utils/docker/debian8/release/Dockerfile
@@ -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/

diff --git a/utils/docker/example/release/Dockerfile b/utils/docker/example/release/Dockerfile
index 5387dd082f72435029d1aee2175f516676661ae6..b088ad885ac5ac7fe059c34bc36752ca53782eed 100644 (file)
--- a/utils/docker/example/release/Dockerfile
+++ b/utils/docker/example/release/Dockerfile
@@ -21,4 +21,4 @@ LABEL maintainer "Maintainer <maintainer@email>"
 
 # 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/

diff --git a/utils/docker/nvidia-cuda/release/Dockerfile b/utils/docker/nvidia-cuda/release/Dockerfile
index b9bcae1597805e49ed3120cc17bcf9b6914c9044..a30d7d7e91ee1f965e8f6e71a5959915287c10e0 100644 (file)
--- a/utils/docker/nvidia-cuda/release/Dockerfile
+++ b/utils/docker/nvidia-cuda/release/Dockerfile
@@ -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.