Skip to content
Snippets Groups Projects
Commit 663fec11 authored by Lars Bilke's avatar Lars Bilke
Browse files

[Docker] Bumped Conan to 1.10.0

parent 651493db
No related branches found
No related tags found
No related merge requests found
...@@ -15,7 +15,7 @@ RUN apt-get update && apt-get install -y software-properties-common curl \ ...@@ -15,7 +15,7 @@ RUN apt-get update && apt-get install -y software-properties-common curl \
xz-utils xz-utils
RUN python -m pip install --upgrade pip \ RUN python -m pip install --upgrade pip \
&& python -m pip install cmake conan>=1.5.1 && python -m pip install cmake conan>=1.10.0
# Ninja # Ninja
RUN curl -L -o ninja-linux.zip https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linux.zip \ RUN curl -L -o ninja-linux.zip https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linux.zip \
......
...@@ -15,7 +15,7 @@ RUN apt-get update && apt-get install -y software-properties-common curl \ ...@@ -15,7 +15,7 @@ RUN apt-get update && apt-get install -y software-properties-common curl \
xz-utils xz-utils
RUN python -m pip install --upgrade pip \ RUN python -m pip install --upgrade pip \
&& python -m pip install cmake conan>=1.5.1 && python -m pip install cmake conan>=1.10.0
# Ninja # Ninja
RUN curl -L -o ninja-linux.zip https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linux.zip \ RUN curl -L -o ninja-linux.zip https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linux.zip \
......
...@@ -8,15 +8,15 @@ RUN apt-get update && apt-get install -y software-properties-common curl \ ...@@ -8,15 +8,15 @@ RUN apt-get update && apt-get install -y software-properties-common curl \
ccache \ ccache \
gcc-4.9 g++-4.9 gcc-4.9-base \ gcc-4.9 g++-4.9 gcc-4.9-base \
git git-lfs \ git git-lfs \
python-pip \ python3-pip \
sudo \ sudo \
unzip unzip
ENV CC=gcc-4.9 ENV CC=gcc-4.9
ENV CXX=g++-4.9 ENV CXX=g++-4.9
RUN python -m pip install --upgrade pip \ RUN python3 -m pip install --upgrade pip \
&& python -m pip install cmake conan>=1.5.1 && python3 -m pip install cmake conan>=1.10.0
# Ninja # Ninja
RUN curl -L -o ninja-linux.zip https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linux.zip \ RUN curl -L -o ninja-linux.zip https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linux.zip \
......
...@@ -16,7 +16,7 @@ ENV CC=gcc-4.9 ...@@ -16,7 +16,7 @@ ENV CC=gcc-4.9
ENV CXX=g++-4.9 ENV CXX=g++-4.9
RUN python -m pip install --upgrade pip \ RUN python -m pip install --upgrade pip \
&& python -m pip install cmake conan>=1.5.1 && python -m pip install cmake conan>=1.10.0
# Ninja # Ninja
RUN curl -L -o ninja-linux.zip https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linux.zip \ RUN curl -L -o ninja-linux.zip https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linux.zip \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment