Skip to content

Commit

Permalink
force relogin for all shells after pipx ensurepath is called
Browse files Browse the repository at this point in the history
  • Loading branch information
Taepper committed Jan 7, 2025
1 parent 7dc9395 commit ed1a357
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
3 changes: 2 additions & 1 deletion Dockerfile_dependencies
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ RUN apt update && apt dist-upgrade -y \

RUN python3 -m pipx install conan==2.8.1
RUN python3 -m pipx ensurepath
SHELL ["/bin/bash", "-login", "-c"]

WORKDIR /src
COPY conanfile.py conanprofile.docker conanprofile.docker_arm ./
Expand All @@ -17,4 +18,4 @@ RUN if [ "$TARGETPLATFORM" = "linux/arm64" ]; then \
mv conanprofile.docker conanprofile; \
fi

RUN ~/.local/bin/conan install . --build=missing --profile ./conanprofile --profile:build ./conanprofile --output-folder=build/Release/generators
RUN conan install . --build=missing --profile ./conanprofile --profile:build ./conanprofile --output-folder=build/Release/generators
3 changes: 2 additions & 1 deletion Dockerfile_linter_dependencies
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ RUN apt update \

RUN python3 -m pipx install conan==2.8.1
RUN python3 -m pipx ensurepath
SHELL ["/bin/bash", "-login", "-c"]

COPY conanfile.py conanprofile.docker conanprofile.docker_arm ./
RUN if [ "$TARGETPLATFORM" = "linux/arm64" ]; then \
Expand All @@ -21,4 +22,4 @@ RUN if [ "$TARGETPLATFORM" = "linux/arm64" ]; then \
mv conanprofile.docker conanprofile; \
fi

RUN ~/.local/bin/conan install . --build=missing --profile ./conanprofile --profile:build ./conanprofile --output-folder=build/Debug/generators -s build_type=Debug
RUN conan install . --build=missing --profile ./conanprofile --profile:build ./conanprofile --output-folder=build/Debug/generators -s build_type=Debug

0 comments on commit ed1a357

Please sign in to comment.