Skip to content

Commit 31a6c99

Browse files
committed
remove suffix and explicit visualization build
Signed-off-by: Esteve Fernandez <esteve.fernandez@tier4.jp>
1 parent 5e057cb commit 31a6c99

File tree

1 file changed

+2
-16
lines changed

1 file changed

+2
-16
lines changed

docker/build.sh

+2-16
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ print_help() {
1111
echo " --no-cuda Disable CUDA support"
1212
echo " --platform Specify the platform (default: current platform)"
1313
echo " --devel-only Build devel image only"
14-
echo " --target Specify the target image"
14+
echo " --target Specify the target image (default: universe or universe-devel if --devel-only is set)"
1515
echo ""
1616
echo "Note: The --platform option should be one of 'linux/amd64' or 'linux/arm64'."
1717
}
@@ -65,6 +65,7 @@ set_cuda_options() {
6565
set_build_options() {
6666
if [ -n "$option_target" ]; then
6767
target="$option_target"
68+
image_name_suffix=""
6869
else
6970
if [ "$option_devel_only" = "true" ]; then
7071
target="universe-devel"
@@ -158,21 +159,6 @@ build_images() {
158159
--set "universe.tags=ghcr.io/autowarefoundation/autoware:universe" \
159160
--set "universe-cuda.tags=ghcr.io/autowarefoundation/autoware:universe-cuda" \
160161
--set "universe-visualization.tags=ghcr.io/autowarefoundation/autoware:universe-visualization" \
161-
"universe-visualization"
162-
docker buildx bake --load --progress=plain -f "$SCRIPT_DIR/docker-bake.hcl" -f "$SCRIPT_DIR/docker-bake-cuda.hcl" \
163-
--set "*.context=$WORKSPACE_ROOT" \
164-
--set "*.ssh=default" \
165-
--set "*.platform=$platform" \
166-
--set "*.args.ROS_DISTRO=$rosdistro" \
167-
--set "*.args.BASE_IMAGE=$base_image" \
168-
--set "*.args.AUTOWARE_BASE_IMAGE=$autoware_base_image" \
169-
--set "*.args.AUTOWARE_BASE_CUDA_IMAGE=$autoware_base_cuda_image" \
170-
--set "*.args.SETUP_ARGS=$setup_args" \
171-
--set "*.args.LIB_DIR=$lib_dir" \
172-
--set "universe-devel.tags=ghcr.io/autowarefoundation/autoware:universe-devel" \
173-
--set "universe-devel-cuda.tags=ghcr.io/autowarefoundation/autoware:universe-devel-cuda" \
174-
--set "universe.tags=ghcr.io/autowarefoundation/autoware:universe" \
175-
--set "universe-cuda.tags=ghcr.io/autowarefoundation/autoware:universe-cuda" \
176162
"$target$image_name_suffix"
177163
set +x
178164
}

0 commit comments

Comments
 (0)