Skip to content

Commit

Permalink
Merge pull request #5114 from assimp/kimkulling/update_docker_image
Browse files Browse the repository at this point in the history
Update_ Use latest ubuntu image and switch to ninja
  • Loading branch information
kimkulling committed May 31, 2023
2 parents bee751b + 1538669 commit c22ddfd
Showing 1 changed file with 6 additions and 10 deletions.
16 changes: 6 additions & 10 deletions Dockerfile
@@ -1,14 +1,9 @@
FROM ubuntu:14.04
FROM ubuntu:22.04

RUN apt-get update && apt-get install -y \
RUN apt-get update && apt-get install -y ninja-build \
git cmake build-essential software-properties-common

RUN add-apt-repository ppa:ubuntu-toolchain-r/test && apt-get update && apt-get install -y gcc-4.9 g++-4.9 && \
cd /usr/bin && \
rm gcc g++ cpp && \
ln -s gcc-4.9 gcc && \
ln -s g++-4.9 g++ && \
ln -s cpp-4.9 cpp
RUN add-apt-repository ppa:ubuntu-toolchain-r/test && apt-get update

WORKDIR /opt

Expand All @@ -19,7 +14,8 @@ WORKDIR /opt/assimp

RUN git checkout master \
&& mkdir build && cd build && \
cmake \
cmake -G 'Ninja' \
-DCMAKE_BUILD_TYPE=Release \
-DASSIMP_BUILD_ASSIMP_TOOLS=ON \
.. && \
make && make install
ninja -j4 && ninja install

0 comments on commit c22ddfd

Please sign in to comment.