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

Commit 5db36c9

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

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

docker/Dockerfile

+3-2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ ENV CONAN_SYSREQUIRES_SUDO 0
2525
# a few dependencies. This flag allows Conan to proceed with these installations;
2626
# leaving this flag undefined can cause some installation failures.
2727
ENV CONAN_SYSREQUIRES_MODE enabled
28+
ENV CONAN_REVISIONS_ENABLED 1
2829

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

43-
ARG LLVM_VER="13"
44+
ARG LLVM_VER="14"
4445
# Add clang-${LLVM_VER}
4546
ARG LLVM_URL="http://apt.llvm.org/${VARIANT}/"
4647
ARG LLVM_PKG="llvm-toolchain-${VARIANT}-${LLVM_VER}"
@@ -62,7 +63,7 @@ RUN update-alternatives --install /usr/bin/clang clang $(which clang-${LLVM_VER}
6263
RUN update-alternatives --install /usr/bin/clang++ clang++ $(which clang++-${LLVM_VER}) 100
6364

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

0 commit comments

Comments
 (0)