no-prebuilt to devel-only

autowarefoundation · Jan 11, 2024 · 37b8059 · 37b8059
1 parent 31ba91e
commit 37b8059
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/docker-build-and-push-main.yaml b/.github/workflows/docker-build-and-push-main.yaml
@@ -50,7 +50,6 @@ jobs:
             *.platform=linux/amd64
             *.args.ROS_DISTRO=${{ env.rosdistro }}
             *.args.BASE_IMAGE=${{ env[format('{0}', matrix.base_image_env)] }}
-            *.args.PREBUILT_BASE_IMAGE=${{ env.prebuilt_base_image }}
             *.args.SETUP_ARGS=${{ matrix.setup-args }}
             *.args.LIB_DIR=${{ matrix.lib_dir }}
           tag-prefix: ${{ env.rosdistro }}-

diff --git a/docker/README.md b/docker/README.md
@@ -99,10 +99,10 @@ To build without CUDA, use the `--no-cuda` option:
 ./docker/build.sh --no-cuda
 ```
 
-To build only development image, use the `--no-prebuilt` option:
+To build only development image, use the `--devel-only` option:
 
 ```bash
-./docker/build.sh --no-prebuilt
+./docker/build.sh --devel-only
 ```
 
 To specify the platform, use the `--platform` option:

diff --git a/docker/autoware-openadk/Dockerfile b/docker/autoware-openadk/Dockerfile
@@ -85,6 +85,7 @@ ARG ROS_DISTRO
 WORKDIR /autoware
 
 # Build and change permission for runtime data conversion
+COPY autoware.repos /autoware/
 RUN --mount=type=ssh \
   mkdir src \
   && vcs import src < autoware.repos \

diff --git a/docker/build.sh b/docker/build.sh
@@ -10,7 +10,7 @@ print_help() {
     echo "  -h              Display this help message"
     echo "  --no-cuda       Disable CUDA support"
     echo "  --platform      Specify the platform (default: current platform)"
-    echo "  --no-prebuilt   Build devel image only"
+    echo "  --devel-only    Build devel image only"
     echo ""
     echo "Note: The --platform option should be one of 'linux/amd64' or 'linux/arm64'."
 }
@@ -33,8 +33,8 @@ parse_arguments() {
             option_platform="$2"
             shift
             ;;
-        --no-prebuilt)
-            option_no_prebuilt=true
+        --devel-only)
+            option_devel_only=true
             ;;
         esac
         shift
@@ -51,9 +51,9 @@ set_cuda_options() {
     fi
 }
 
-# Set prebuilt options
-set_prebuilt_options() {
-    if [ "$option_no_prebuilt" = "true" ]; then
+# Set build options
+set_build_options() {
+    if [ "$option_devel_only" = "true" ]; then
         targets=("devel")
     else
         targets=()
@@ -123,7 +123,7 @@ build_images() {
 # Main script execution
 parse_arguments "$@"
 set_cuda_options
-set_prebuilt_options
+set_build_options
 set_platform
 set_arch_lib_dir
 load_env