Skip to content

Commit

Permalink
typehints
Browse files Browse the repository at this point in the history
  • Loading branch information
henryborchers committed Oct 11, 2023
1 parent 346ffc0 commit f17cd1a
Showing 1 changed file with 0 additions and 10 deletions.
10 changes: 0 additions & 10 deletions ci/docker/linux/tox/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
ARG PIPX_HOME=/pipx
ARG CONAN_USER_HOME=/conan
ARG PIP_DOWNLOAD_CACHE=/.cache/pip
FROM ubuntu:22.04
COPY ci/docker/linux/tox/apt-packages.txt /tmp/
Expand All @@ -23,15 +22,6 @@ RUN mkdir -p ${PIP_DOWNLOAD_CACHE} && \
chmod -R 777 ${PIP_DOWNLOAD_CACHE}
ENV PIP_DOWNLOAD_CACHE=${PIP_DOWNLOAD_CACHE}

COPY ci/docker/linux/shared/update_conan_compiler.py /tmp/update_conan_compiler.py
ARG CONAN_USER_HOME
RUN conan config init && \
conan config set general.revisions_enabled=1 && \
conan profile update settings.compiler.version=$(cc -dumpfullversion -dumpversion | grep -oE "^([0-9]+(\.)?)([0-9]+?)") default && \
python3 /tmp/update_conan_compiler.py ${CONAN_USER_HOME}/.conan/settings.yml gcc $(cc -dumpfullversion -dumpversion | grep -oE "^([0-9]+(\.)?)([0-9]+?)")
ENV CONAN_USER_HOME=${CONAN_USER_HOME}


ARG PIPX_HOME
ENV PIPX_HOME=${PIPX_HOME}
ENV PIPX_BIN_DIR=${PIPX_HOME}/bin
Expand Down

0 comments on commit f17cd1a

Please sign in to comment.