Skip to content

Commit

Permalink
Modify build/run scripts to use both of distributions
Browse files Browse the repository at this point in the history
  • Loading branch information
aohsato committed Nov 7, 2017
1 parent 46ff2bb commit a87f42c
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 11 deletions.
12 changes: 4 additions & 8 deletions docker/build.sh
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
#!/bin/sh

# Build Docker Image
if [ "$1" = "" ] || [ "$1" = "kinetic" ]
if [ "$1" = "kinetic" ] || [ "$1" = "indigo" ]
then
echo "Use Kinetic"
nvidia-docker build -t autoware-image -f Dockerfile.kinetic .
elif [ "$1" = "indigo" ]
then
echo "Use Indigo"
nvidia-docker build -t autoware-image -f Dockerfile.indigo .
echo "Use $1"
nvidia-docker build -t autoware-$1 -f Dockerfile.$1 .
else
echo "Invalid argument."
echo "Select distribution, kinetic|indigo"
fi
14 changes: 11 additions & 3 deletions docker/run.sh
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,20 @@ XAUTH=/home/$USER/.Xauthority
SHARED_DIR=/home/$USER/shared_dir
HOST_DIR=/home/$USER/shared_dir

if [ "$1" = "" ]
if [ "$1" = "kinetic" ] || [ "$1" = "indigo" ]
then
echo "Use $1"
else
echo "Select distribution, kinetic|indigo"
exit
fi

if [ "$2" = "" ]
then
# Create Shared Folder
mkdir -p $SHARED_DIR
else
HOST_DIR=$1
HOST_DIR=$2
fi
echo "Shared directory: ${HOST_DIR}"

Expand All @@ -22,4 +30,4 @@ nvidia-docker run \
--env="XAUTHORITY=${XAUTH}" \
--env="DISPLAY=${DISPLAY}" \
-u autoware \
autoware-image
autoware-$1

0 comments on commit a87f42c

Please sign in to comment.