Update Dockerfile with changes from @jemc

ponylang · Apr 4, 2018 · 1f17055 · 1f17055
1 parent 117677f
commit 1f17055
Showing 1 changed file with 10 additions and 13 deletions.
diff --git a/.ci-dockerfiles/llvm-6.0.0/Dockerfile b/.ci-dockerfiles/llvm-6.0.0/Dockerfile
@@ -3,28 +3,25 @@ FROM ubuntu:14.04
 ENV LLVM_VERSION 6.0.0
 
 RUN apt-get update \
- && apt-get install -y software-properties-common \
- && add-apt-repository -y ppa:ubuntu-toolchain-r/test \
- && apt-get update \
  && apt-get install -y \
   apt-transport-https \
   build-essential \
-  g++-6 \
+  g++ \
   git \
   libncurses5-dev \
   libssl-dev \
   make \
   wget \
   xz-utils \
   zlib1g-dev \
- && wget -O - http://llvm.org/releases/${LLVM_VERSION}/clang+llvm-${LLVM_VERSION}-x86_64-linux-gnu-ubuntu-14.04.tar.xz \
- | tar xJf - --strip-components 1 -C /usr/local/ clang+llvm-${LLVM_VERSION}-x86_64-linux-gnu-ubuntu-14.04
-
-# install pcre2
-RUN wget ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre2-10.21.tar.bz2 \
- && tar xvf pcre2-10.21.tar.bz2 \
+ && cd /tmp \
+ && wget ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre2-10.21.tar.bz2 \
+ && tar xjvf pcre2-10.21.tar.bz2 \
  && cd pcre2-10.21 \
  && ./configure --prefix=/usr \
- && make install \
- && cd .. \
- && rm -rf pcre2-10.21*
+ && make \
+ && sudo make install \
+ && cd / \
+ && rm -rf /tmp/pcre* \
+ && wget -O - http://releases.llvm.org/${LLVM_VERSION}/clang+llvm-${LLVM_VERSION}-x86_64-linux-gnu-ubuntu-14.04.tar.xz \
+ | tar xJf - --no-same-owner --strip-components 1 -C /usr/local/ clang+llvm-${LLVM_VERSION}-x86_64-linux-gnu-ubuntu-14.04