Update 2 files
This commit is contained in:
@@ -38,8 +38,10 @@ RUN --mount=type=cache,target=/ccache \
|
|||||||
${CMAKE_TOOLCHAIN_FILE:+-DCMAKE_TOOLCHAIN_FILE=$CMAKE_TOOLCHAIN_FILE}
|
${CMAKE_TOOLCHAIN_FILE:+-DCMAKE_TOOLCHAIN_FILE=$CMAKE_TOOLCHAIN_FILE}
|
||||||
|
|
||||||
# Build project (ccache will help here when only some files change)
|
# Build project (ccache will help here when only some files change)
|
||||||
|
# Remove stale autogen files to force dehydrate to regenerate from current agent sources
|
||||||
RUN --mount=type=cache,target=/ccache \
|
RUN --mount=type=cache,target=/ccache \
|
||||||
--mount=type=cache,target=/build \
|
--mount=type=cache,target=/build \
|
||||||
|
rm -f /app/src/autogen/_agent-remote.* /app/src/autogen/_agent-local.* && \
|
||||||
cmake --build /build
|
cmake --build /build
|
||||||
|
|
||||||
# Copy the built executables to a regular directory for the final stage
|
# Copy the built executables to a regular directory for the final stage
|
||||||
|
|||||||
@@ -71,7 +71,7 @@ fi
|
|||||||
# GPU list (may have 0, 1, or multiple)
|
# GPU list (may have 0, 1, or multiple)
|
||||||
GPU_JSON="[]"
|
GPU_JSON="[]"
|
||||||
if command -v lspci &>/dev/null; then
|
if command -v lspci &>/dev/null; then
|
||||||
GPU_LINES=$(lspci 2>/dev/null | grep -i 'vga\|3d\|display' | sed 's/^[^ ]* //' || true)
|
GPU_LINES=$(lspci 2>/dev/null | grep -i 'vga\|3d\|display' | sed 's/^[^ ]* //; s/VGA compatible controller: //; s/3D controller: //; s/Display controller: //' || true)
|
||||||
if [ -n "$GPU_LINES" ]; then
|
if [ -n "$GPU_LINES" ]; then
|
||||||
GPU_JSON="["
|
GPU_JSON="["
|
||||||
first=true
|
first=true
|
||||||
|
|||||||
Reference in New Issue
Block a user