Skip to content
This repository was archived by the owner on Apr 19, 2023. It is now read-only.

Commit 0ae68b9

Browse files
ddalcinoJason5480
andauthored
Apply suggestions from code review
Co-authored-by: Iason Nikolas <[email protected]>
1 parent b0a362e commit 0ae68b9

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

docker/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ ENV CONAN_SYSREQUIRES_SUDO 0
2424
# Some packages request that Conan use the system package manager to install
2525
# a few dependencies. This flag allows Conan to proceed with these installations;
2626
# leaving this flag undefined can cause some installation failures.
27-
ENV CONAN_SYSREQUIRES_MODE enabled
27+
ENV CONAN_REVISIONS_ENABLED 1
2828

2929
# User-settable versions:
3030
# This Dockerfile should support gcc-[7, 8, 9, 10, 11] and clang-[10, 11, 12, 13]
@@ -40,7 +40,7 @@ RUN add-apt-repository -y ppa:ubuntu-toolchain-r/test && \
4040
RUN update-alternatives --install /usr/bin/gcc gcc $(which gcc-${GCC_VER}) 100
4141
RUN update-alternatives --install /usr/bin/g++ g++ $(which g++-${GCC_VER}) 100
4242

43-
ARG LLVM_VER="13"
43+
ARG LLVM_VER="14"
4444
# Add clang-${LLVM_VER}
4545
ARG LLVM_URL="http://apt.llvm.org/${VARIANT}/"
4646
ARG LLVM_PKG="llvm-toolchain-${VARIANT}-${LLVM_VER}"
@@ -62,7 +62,7 @@ RUN update-alternatives --install /usr/bin/clang clang $(which clang-${LLVM_VER}
6262
RUN update-alternatives --install /usr/bin/clang++ clang++ $(which clang++-${LLVM_VER}) 100
6363

6464
# Add current cmake/ccmake, from Kitware
65-
ENV KEYRING_FILE="/usr/share/keyrings/kitware-archive-keyring.gpg"
65+
ENV KEYRING_FILE "/usr/share/keyrings/kitware-archive-keyring.gpg"
6666
RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null \
6767
| gpg --dearmor - | tee "${KEYRING_FILE}" >/dev/null && \
6868
echo "deb [signed-by=${KEYRING_FILE}] https://apt.kitware.com/ubuntu/ ${VARIANT} main" \

0 commit comments

Comments
 (0)