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

[docker] Added libglu1-mesa-dev to gui image, Conan 1.17.0

parent 9dcd1a0f
No related branches found
No related tags found
No related merge requests found
......@@ -73,12 +73,12 @@ RUN apt-get update -y && \
python3-setuptools \
python3-wheel && \
rm -rf /var/lib/apt/lists/*
RUN pip3 install conan==1.16.0
RUN pip3 install conan==1.17.0
RUN mkdir -p /opt/conan && \
chmod 777 /opt/conan
ENV CONAN_USER_HOME=/opt/conan
LABEL org.opengeosys.pm=conan \
org.opengeosys.pm.conan.version=1.16.0
org.opengeosys.pm.conan.version=1.17.0
LABEL org.opengeosys.pm.conan.user_home=/opt/conan
# Include-what-you-use for clang version 7
......
......@@ -66,12 +66,12 @@ RUN apt-get update -y && \
python3-setuptools \
python3-wheel && \
rm -rf /var/lib/apt/lists/*
RUN pip3 install conan==1.16.0
RUN pip3 install conan==1.17.0
RUN mkdir -p /opt/conan && \
chmod 777 /opt/conan
ENV CONAN_USER_HOME=/opt/conan
LABEL org.opengeosys.pm=conan \
org.opengeosys.pm.conan.version=1.16.0
org.opengeosys.pm.conan.version=1.17.0
LABEL org.opengeosys.pm.conan.user_home=/opt/conan
# cppcheck version 1.87
......
......@@ -61,6 +61,7 @@ RUN apt-get update && \
RUN apt-get update -y && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
libgl1-mesa-dev \
libglu1-mesa-dev \
libxt-dev \
mesa-common-dev && \
rm -rf /var/lib/apt/lists/*
......@@ -73,12 +74,12 @@ RUN apt-get update -y && \
python3-setuptools \
python3-wheel && \
rm -rf /var/lib/apt/lists/*
RUN pip3 install conan==1.16.0
RUN pip3 install conan==1.17.0
RUN mkdir -p /opt/conan && \
chmod 777 /opt/conan
ENV CONAN_USER_HOME=/opt/conan
LABEL org.opengeosys.pm=conan \
org.opengeosys.pm.conan.version=1.16.0
org.opengeosys.pm.conan.version=1.17.0
LABEL org.opengeosys.pm.conan.user_home=/opt/conan
# cppcheck version 1.87
......
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