Skip to content

Commit ae25cc4

Browse files
authored
fix(docker): fix docker image tagging on build/run scripts (autowarefoundation#5199)
* fix docker image naming Signed-off-by: Oguz Ozturk <oguzkaganozt@gmail.com> * . Signed-off-by: Oguz Ozturk <oguzkaganozt@gmail.com> --------- Signed-off-by: Oguz Ozturk <oguzkaganozt@gmail.com>
1 parent e56d4c3 commit ae25cc4

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

docker/build.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ set_cuda_options() {
5959
# Set build options
6060
set_build_options() {
6161
if [ "$option_devel_only" = "true" ]; then
62-
targets=("devel")
62+
targets=("universe-devel")
6363
else
6464
targets=()
6565
fi
@@ -132,9 +132,9 @@ build_images() {
132132
--set "*.args.BASE_IMAGE=$base_image" \
133133
--set "*.args.SETUP_ARGS=$setup_args" \
134134
--set "*.args.LIB_DIR=$lib_dir" \
135-
--set "base.tags=ghcr.io/autowarefoundation/autoware:latest-base" \
136-
--set "devel.tags=ghcr.io/autowarefoundation/autoware:latest-devel$image_name_suffix" \
137-
--set "runtime.tags=ghcr.io/autowarefoundation/autoware:latest-runtime$image_name_suffix" \
135+
--set "base.tags=ghcr.io/autowarefoundation/autoware:base" \
136+
--set "universe-devel.tags=ghcr.io/autowarefoundation/autoware:universe-devel$image_name_suffix" \
137+
--set "universe.tags=ghcr.io/autowarefoundation/autoware:universe$image_name_suffix" \
138138
"${targets[@]}"
139139
set +x
140140
}

docker/run.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ parse_arguments() {
9191
set_variables() {
9292
if [ "$option_devel" = "true" ]; then
9393
# Set image based on option
94-
IMAGE="ghcr.io/autowarefoundation/autoware:latest-devel"
94+
IMAGE="ghcr.io/autowarefoundation/autoware:universe-devel"
9595

9696
# Set workspace path, if not provided use the current directory
9797
if [ "$WORKSPACE_PATH" = "" ]; then
@@ -113,12 +113,12 @@ set_variables() {
113113
fi
114114
else
115115
# Set image based on option
116-
IMAGE="ghcr.io/autowarefoundation/autoware:latest-runtime"
116+
IMAGE="ghcr.io/autowarefoundation/autoware:universe"
117117

118118
# Set map path
119119
if [ "$MAP_PATH" = "" ]; then
120120
echo -e "\n------------------------------------------------------------"
121-
echo -e "${RED}Note:${NC} The --map-path option is mandatory for the runtime. For development environment with shell access, use --devel option."
121+
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."
122122
echo -e "------------------------------------------------------------"
123123
exit 1
124124
else

0 commit comments

Comments
 (0)