fix(docker): fix docker image tagging on build/run scripts (autowaref…

…oundation#5199) * fix docker image naming Signed-off-by: Oguz Ozturk <[email protected]> * . Signed-off-by: Oguz Ozturk <[email protected]> --------- Signed-off-by: Oguz Ozturk <[email protected]>
1222-takeshi · Sep 11, 2024 · ae25cc4 · ae25cc4
1 parent e56d4c3
commit ae25cc4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/docker/build.sh b/docker/build.sh
@@ -59,7 +59,7 @@ set_cuda_options() {
 # Set build options
 set_build_options() {
     if [ "$option_devel_only" = "true" ]; then
-        targets=("devel")
+        targets=("universe-devel")
     else
         targets=()
     fi
@@ -132,9 +132,9 @@ build_images() {
         --set "*.args.BASE_IMAGE=$base_image" \
         --set "*.args.SETUP_ARGS=$setup_args" \
         --set "*.args.LIB_DIR=$lib_dir" \
-        --set "base.tags=ghcr.io/autowarefoundation/autoware:latest-base" \
-        --set "devel.tags=ghcr.io/autowarefoundation/autoware:latest-devel$image_name_suffix" \
-        --set "runtime.tags=ghcr.io/autowarefoundation/autoware:latest-runtime$image_name_suffix" \
+        --set "base.tags=ghcr.io/autowarefoundation/autoware:base" \
+        --set "universe-devel.tags=ghcr.io/autowarefoundation/autoware:universe-devel$image_name_suffix" \
+        --set "universe.tags=ghcr.io/autowarefoundation/autoware:universe$image_name_suffix" \
         "${targets[@]}"
     set +x
 }

diff --git a/docker/run.sh b/docker/run.sh
@@ -91,7 +91,7 @@ parse_arguments() {
 set_variables() {
     if [ "$option_devel" = "true" ]; then
         # Set image based on option
-        IMAGE="ghcr.io/autowarefoundation/autoware:latest-devel"
+        IMAGE="ghcr.io/autowarefoundation/autoware:universe-devel"
 
         # Set workspace path, if not provided use the current directory
         if [ "$WORKSPACE_PATH" = "" ]; then
@@ -113,12 +113,12 @@ set_variables() {
         fi
     else
         # Set image based on option
-        IMAGE="ghcr.io/autowarefoundation/autoware:latest-runtime"
+        IMAGE="ghcr.io/autowarefoundation/autoware:universe"
 
         # Set map path
         if [ "$MAP_PATH" = "" ]; then
             echo -e "\n------------------------------------------------------------"
-            echo -e "${RED}Note:${NC} The --map-path option is mandatory for the runtime. For development environment with shell access, use --devel option."
+            echo -e "${RED}Note:${NC} The --map-path option is mandatory for the universe(runtime image). For development environment with shell access, use --devel option."
             echo -e "------------------------------------------------------------"
             exit 1
         else