Skip to content

Commit 5b630ed

Browse files
committed
docker: simplify setup script
don't ask for build directory, like other ev3dev projects
1 parent bfeda74 commit 5b630ed

1 file changed

Lines changed: 6 additions & 9 deletions

File tree

docker/setup.sh

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,9 @@ set -e
44

55
script_dir=$(dirname $(readlink -f "$0"))
66

7-
build_dir="$1"
8-
if [ ! -n "$build_dir" ]; then
9-
echo "Error: Must specify build directory"
10-
exit 1
11-
fi
12-
13-
case $2 in
7+
case $1 in
148
armel|armhf)
15-
arch=$2
9+
arch=$1
1610
;;
1711
*)
1812
echo "Error: Must specify 'armel' or 'armhf'"
@@ -25,21 +19,24 @@ if ! which docker >/dev/null; then
2519
exit 1
2620
fi
2721

22+
build_dir="build-$arch"
2823
image_name="ev3devkit-$arch"
2924
container_name="ev3devkit_$arch"
3025

26+
mkdir -p $build_dir
27+
3128
docker build \
3229
--tag $image_name \
3330
--no-cache \
3431
--file "$script_dir/$arch.dockerfile" \
3532
"$script_dir/"
36-
mkdir -p $build_dir
3733

3834
docker rm --force $container_name >/dev/null 2>&1 || true
3935
docker run \
4036
--volume "$(readlink -f $build_dir):/build" \
4137
--volume "$(pwd):/src" \
4238
--workdir /build \
39+
--user $(id -u):$(id -g) \
4340
--name $container_name \
4441
--env "TERM=$TERM" \
4542
--env "DESTDIR=/build/dist" \

0 commit comments

Comments
 (0)