Skip to content

Commit

Permalink
docker.conan2
Browse files Browse the repository at this point in the history
  • Loading branch information
R3D9477 committed Nov 30, 2024
1 parent 5f41fb9 commit 774dd97
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 15 deletions.
8 changes: 6 additions & 2 deletions .devcontainer/Dockerfile_debian_clang-19
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@ RUN update-alternatives --install /usr/bin/clang clang /usr/bin/clang-19 100
RUN update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-19 100
RUN update-alternatives --install /usr/bin/clang-tidy clang-tidy /usr/bin/clang-tidy-19 100

# INSTALL ADDITIONAL PKGS (for Qt6)
# INSTALL ADDITIONAL PKGS

# for Qt6
RUN apt install pkg-config libgl-dev libgl1-mesa-dev xkb-data libxcb-util-dev libxcb-util0-dev \
libx11-xcb-dev libfontenc-dev libice-dev libsm-dev libxaw7-dev libxcomposite-dev libxcursor-dev \
libxdamage-dev libxext-dev libxfixes-dev libxi-dev libxinerama-dev libxkbfile-dev libxmu-dev libxmuu-dev \
Expand All @@ -28,6 +29,9 @@ RUN apt install pkg-config libgl-dev libgl1-mesa-dev xkb-data libxcb-util-dev li
libxcb-dri3-dev uuid-dev libxcb-cursor-dev libxcb-dri2-0-dev libxcb-dri3-dev libxcb-present-dev libxcb-composite0-dev \
libxcb-ewmh-dev libxcb-res0-dev -y

# for OpenCV
RUN apt install libva-dev libvdpau-dev -y

# INSTALL CPPTOOLS

RUN apt install python3 python3-venv -y
Expand All @@ -50,4 +54,4 @@ RUN /home/build/.local/bin/pip install cmake
RUN /home/build/.local/bin/pip install conan
RUN /home/build/.local/bin/conan remote update conancenter --url="https://center2.conan.io"

RUN /home/build/.local/bin/pip install gprof2dot matplotlib pillow
RUN /home/build/.local/bin/pip install gprof2dot matplotlib pillow
Empty file removed .devcontainer/conan2_cache/.keep
Empty file.
23 changes: 11 additions & 12 deletions .devcontainer/docker-compose.user_debian_clang-19.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,24 +19,23 @@ x-volume-cppproject: &volume-cppproject
source: ../
target: /home/build/cppproject

x-volume-conan2-cache: &volume-conan2-cache
x-volume-ssh-agent: &volume-ssh-agent
type: bind
source: ./conan2_cache
target: /home/build/.conan2
bind:
create_host_path: true
source: ${SSH_AUTH_SOCK:-/dev/null}
target: /ssh-agent

x-volume-X11: &volume-X11
type: bind
source: /tmp/.X11-unix
target: /tmp/.X11-unix

services:
cppproject:
<<: *setup
volumes:
- <<: *volume-cppproject
- <<: *volume-conan2-cache
- type: bind
source: ${SSH_AUTH_SOCK:-/dev/null}
target: /ssh-agent
- type: bind
source: /tmp/.X11-unix
target: /tmp/.X11-unix
- <<: *volume-ssh-agent
- <<: *volume-X11
- $HOME/.conan2:/home/build/.conan2
devices:
- /dev/dri:/dev/dri
2 changes: 1 addition & 1 deletion conanfile.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ CMakeDeps
CMakeToolchain

[layout]
cmake_layout
cmake_layout

0 comments on commit 774dd97

Please sign in to comment.