Skip to content

Use a more robust tag for docker #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
j-rivero wants to merge 1 commit into
base: jazzy
Choose a base branch
from
Open

Use a more robust tag for docker #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .docker/build.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
SCRIPT_DIR="$(cd "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")" &>/dev/null && pwd)"
PROJECT_DIR="$(dirname "${SCRIPT_DIR}")"

TAG="andrejorsula/$(basename "${PROJECT_DIR}")"
TAG=$(git -C "${PROJECT_DIR}" remote get-url origin | sed 's/.*\///; s/\.git$//')
TAG=${TAG}-$(git -C "${PROJECT_DIR}" branch --show-current)
TAG=${TAG}-$(git -C "${PROJECT_DIR}" rev-parse --short HEAD)

if [ "${#}" -gt "0" ]; then
if [[ "${1}" != "-"* ]]; then
Expand Down
6 changes: 4 additions & 2 deletions .docker/run.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#!/usr/bin/env bash

TAG="andrejorsula/panda_ign_moveit2"
TAG=$(git -C "${PROJECT_DIR}" remote get-url origin | sed 's/.*\///; s/\.git$//')
TAG=${TAG}-$(git -C "${PROJECT_DIR}" branch --show-current)
TAG=${TAG}-$(git -C "${PROJECT_DIR}" rev-parse --short HEAD)

## Forward custom volumes and environment variables
CUSTOM_VOLUMES=()
Expand Down Expand Up @@ -81,7 +83,7 @@ if [ -n "${ROS_DOMAIN_ID}" ]; then
fi
# Synchronize IGN_PARTITION with host
if [ -n "${IGN_PARTITION}" ]; then
CUSTOM_ENVS+=("IGN_PARTITION=${IGN_PARTITION}")
CUSTOM_ENVS+=("GZ_PARTITION=${GZ_PARTITION}")
fi
# Synchronize RMW configuration with host
if [ -n "${RMW_IMPLEMENTATION}" ]; then
Expand Down