Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into feat/extend-type-form…
Browse files Browse the repository at this point in the history
…atting
  • Loading branch information
lhruby committed Sep 24, 2024
2 parents d2794ff + 48a9be9 commit 576512f
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 18 deletions.
18 changes: 1 addition & 17 deletions docker/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -62,22 +62,7 @@ while [ "$1" != "" ]; do
done



XSOCK=/tmp/.X11-unix
XAUTH=/tmp/.docker.xauth

# A fix for the weird xauth issues
if [ -d $XAUTH ]; then
rm -rf $XAUTH
touch $XAUTH
fi

if [ ! -f $XAUTH ]; then
touch $XAUTH
fi

xauth nlist $DISPLAY | sed -e 's/^..../ffff/' | xauth -f $XAUTH nmerge -
sudo chown -R "$(whoami)" $XSOCK $XAUTH
GPUOPT="--device=/dev/dri/card0:/dev/dri/card0"

if [ -f /usr/bin/nvidia-smi ]; then
Expand Down Expand Up @@ -114,10 +99,9 @@ docker run --privileged --shm-size=512m --cap-add=SYS_PTRACE --security-opt secc
-d \
--network host -ti \
-v $XSOCK:$XSOCK \
-v $XAUTH:$XAUTH \
-v ${PWD}/..:/workdir/hephaestus \
${EXTRA_MOUNTS} \
${DEVICES} \
${DOCKER_EXTRA_FLAGS} \
--entrypoint ${ENTRYPOINT} \
-e XAUTHORITY=$XAUTH -e DISPLAY=${DISPLAY} ${DEVIMAGE}
-e DISPLAY=${DISPLAY} ${DEVIMAGE}
2 changes: 1 addition & 1 deletion docker/version.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
HOST=ghcr.io/olympus-robotics
VERSION=1.0.9
VERSION=1.0.12
IMAGE=hephaestus-dev

# This is the version of the dep image. Increase this number everytime you change `external/CMakeLists.txt`
Expand Down
1 change: 1 addition & 0 deletions toolchains/toolchain_clang.cmake
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# =================================================================================================
# Copyright (C) 2023-2024 HEPHAESTUS Contributors MIT License
# =================================================================================================

if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
set(LLVM_PATH /opt/homebrew/Cellar/llvm/17.0.6_1/bin)
set(CMAKE_C_COMPILER ${LLVM_PATH}/clang)
Expand Down

0 comments on commit 576512f

Please sign in to comment.