Skip to content

Commit

Permalink
Do manual install of workspace
Browse files Browse the repository at this point in the history
  • Loading branch information
Flova committed Mar 4, 2024
1 parent 9287d75 commit e677efc
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 6 deletions.
1 change: 0 additions & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ SHELL ["/bin/zsh", "-c"]
# Create home directory and colcon workspace
RUN mkdir -p "/root/colcon_ws"


# Install oh-my-zsh for pretty terminal
RUN sh -c "$(wget -O- https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" && \
git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions
Expand Down
6 changes: 3 additions & 3 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,18 @@
"workspaceFolder": "/root/colcon_ws/src/bitbots_main",

"mounts": [
"type=bind,source=${localEnv:HOME},target=/srv/host_home,consistency=cached"
"type=bind,source=${localEnv:HOME},target=/srv/host_home,consistency=cached",
"type=tmpfs,destination=/tmp,tmpfs-size=2G"
],

"runArgs": [
"--privileged",
"--net=host",
"--ulimit", "nofile=1024:524288",
"--device=/dev/dri:/dev/dri",
"--volume=/tmp/.X11-unix:/tmp/.X11-unix",
"--cap-add=SYS_PTRACE",
"--security-opt", "seccomp=unconfined"
],

"postCreateCommand": "git config --global --add safe.directory '*' && make -C $HOME/colcon_ws/src/bitbots_main install"
"postCreateCommand": "git config --global --add safe.directory '*'"
}
9 changes: 9 additions & 0 deletions .devcontainer/zshrc
Original file line number Diff line number Diff line change
Expand Up @@ -108,3 +108,12 @@ alias sa='sr && sc'

# Set default editor
export VISUAL="vim"

# Some user instructions
echo "Hello there! Welcome to the Bit-Bots ROS 2 development environment!"
echo "If you just (re)build this container a few manual steps are nessessary:"
echo "Create a ssh key with 'ssh-keygen -q -f $HOME/.ssh/id_rsa -N \"\" && cat $HOME/.ssh/id_rsa.pub'."
echo "Copy the commands output and add it to your GitHub account ('https://github.com/settings/keys') (ctrl+click to open in browser)."
echo "Now you can install the rest of the workspace and compile everything with 'make install && cba'."
echo "To update an existing workspace you can use 'make update && cba'."
echo "To compile all packages in the workspace use 'cba'. If you want to compile only a specific package use 'cbs <package_name>'."
4 changes: 2 additions & 2 deletions scripts/make_basler.sh
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ else
# Extract the pylon driver
tar -xzf /tmp/pylon_${PYLON_VERSION}.tar.gz -C /tmp
# Install the pylon driver
sudo apt install /tmp/pylon_${PYLON_VERSION}*.deb -y
sudo apt-get install /tmp/pylon_${PYLON_VERSION}*.deb -y
fi

# Check if the correct blaze supplementary package BLAZE_VERSION is installed (apt)
Expand All @@ -73,5 +73,5 @@ else
# Download the blaze supplementary package to temp folder
wget --no-verbose $SHOW_PROGRESS $BLAZE_DOWNLOAD_URL -O /tmp/pylon-blaze-supplementary-package_${BLAZE_VERSION}.deb
# Install the blaze supplementary package
sudo apt install /tmp/pylon-blaze-supplementary-package_${BLAZE_VERSION}*.deb -y
sudo apt-get install /tmp/pylon-blaze-supplementary-package_${BLAZE_VERSION}*.deb -y
fi

0 comments on commit e677efc

Please sign in to comment.