wip

conan-io · Oct 2, 2024 · 597bc00 · 597bc00
1 parent 02d00ae
commit 597bc00
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.ci/docker/conan-tests b/.ci/docker/conan-tests
@@ -144,7 +144,7 @@ RUN mkdir -p /usr/share/bazel-$BAZEL_6_3_2/bin && \
 
 RUN groupadd -g $DOCKER_GID docker || groupmod -g $DOCKER_GID docker
 
-RUN usermod -aG docker conan
+RUN usermod -aG docker root
 
 USER conan
 WORKDIR $HOME

diff --git a/.github/workflows/linux-tests.yml b/.github/workflows/linux-tests.yml
@@ -115,7 +115,7 @@ jobs:
     runs-on: ubuntu-latest
     container:
       image: ghcr.io/${{ github.repository_owner }}/conan-tests:latest
-      options: --user conan -v /var/run/docker.sock:/var/run/docker.sock
+      options: -v /var/run/docker.sock:/var/run/docker.sock
     strategy:
       matrix:
         python-version: ['3.12.3']

diff --git a/conan/internal/runner/docker.py b/conan/internal/runner/docker.py
@@ -113,7 +113,7 @@ def __init__(self, conan_api, command, host_profile, build_profile, args, raw_ar
         # Update conan command and some paths to run inside the container
         raw_args[raw_args.index(args.path)] = self.abs_docker_path
         self.command = ' '.join([f'conan {command}'] + [f'"{raw_arg}"' if ' ' in raw_arg else raw_arg for raw_arg in raw_args] + ['-f json > create.json'])
-        self.command = "pwd && ls /root/conanrunner/pathwithoutspaces && " + self.command
+        self.command = "pwd && ls /root/conanrunner/pathwithoutspaces && ls /root/conan-io && " + self.command
 
     def run(self):
         """