Bugfix

paulsengroup · May 21, 2024 · 0e51248 · 0e51248
1 parent 10cb02d
commit 0e51248
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/dockerfiles/ubuntu-cxx.Dockerfile b/dockerfiles/ubuntu-cxx.Dockerfile
@@ -104,11 +104,8 @@ RUN if [ $COMPILER_NAME = gcc ] ; then \
 &&  update-alternatives --install /usr/bin/ld ld /usr/bin/lld 100;                     \
 fi
 
-COPY patches/conan-settings.patch /tmp/
-
-RUN conan --help \
-&&  patch -i /tmp/conan-settings.patch "$HOME/.conan2/settings.yml" \
-&&  rm /tmp/conan-settings.patch
+# Populate Conan settings
+RUN conan --help
 
 RUN if [ $COMPILER_NAME = clang ] ; then \
     CC=clang-$COMPILER_VERSION    \

diff --git a/patches/conan-settings.patch b/patches/conan-settings.patch