Skip to content

Commit

Permalink
Update readme and docker image namings
Browse files Browse the repository at this point in the history
Signed-off-by: Oguz Ozturk <[email protected]>
  • Loading branch information
oguzkaganozt committed Feb 19, 2024
1 parent d43f1cd commit 1d3651f
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/autowarefoundation/openadk:devel-latest-cuda
FROM ghcr.io/autowarefoundation/openadk:latest-devel

ENV SHELL /bin/bash

Expand Down
4 changes: 2 additions & 2 deletions docker/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

Open AD Kit offers two types of Docker image to let you get started with the Autoware quickly: `devel` and `runtime`.

1. The `devel` image enables you to develop Autoware without setting up the local development environment.
2. The `runtime` image contains only runtime executables and enables you to try out Autoware quickly.
1. The `devel` image contains the development environment and enables you to build and develop Autoware from source. Keep in mind that 'devel' image always include more recent changes than the 'runtime' image to provide the latest development environment.
2. The `runtime` image contains only runtime executables and enables you to try out Autoware quickly. 'runtime' image is more stable than 'devel' image and is recommended for production use.

**Note**: Before proceeding, confirm and agree with the [NVIDIA Deep Learning Container license](https://developer.nvidia.com/ngc/nvidia-deep-learning-container-license). By pulling and using the Autoware Open AD Kit images, you accept the terms and conditions of the license.

Expand Down
10 changes: 5 additions & 5 deletions docker/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ parse_arguments() {
set_cuda_options() {
if [ "$option_no_cuda" = "true" ]; then
setup_args="--no-nvidia"
image_name_suffix=""
image_name_suffix="-nocuda"
else
image_name_suffix="-cuda"
image_name_suffix=""
fi
}

Expand Down Expand Up @@ -119,9 +119,9 @@ build_images() {
--set "*.args.BASE_IMAGE=$base_image" \
--set "*.args.SETUP_ARGS=$setup_args" \
--set "*.args.LIB_DIR=$lib_dir" \
--set "devel.tags=ghcr.io/autowarefoundation/autoware-openadk:devel-$rosdistro-latest$image_name_suffix" \
--set "prebuilt.tags=ghcr.io/autowarefoundation/autoware-openadk:prebuilt-$rosdistro-latest$image_name_suffix" \
--set "runtime.tags=ghcr.io/autowarefoundation/autoware-openadk:runtime-$rosdistro-latest$image_name_suffix" \
--set "devel.tags=ghcr.io/autowarefoundation/autoware-openadk:latest-devel-$image_name_suffix" \
--set "prebuilt.tags=ghcr.io/autowarefoundation/autoware-openadk:latest-prebuilt-$image_name_suffix" \
--set "runtime.tags=ghcr.io/autowarefoundation/autoware-openadk:latest-runtime-$image_name_suffix" \
"${targets[@]}"
set +x
}
Expand Down
12 changes: 6 additions & 6 deletions docker/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ parse_arguments() {
# Set image and workspace variables based on options
set_variables() {
if [ "$option_devel" == "true" ]; then
IMAGE="ghcr.io/autowarefoundation/autoware-openadk:devel-$rosdistro-latest"
IMAGE="ghcr.io/autowarefoundation/autoware-openadk:latest-devel"
USER_ID="-e LOCAL_UID=$(id -u) -e LOCAL_GID=$(id -g) -e LOCAL_USER=$(id -un) -e LOCAL_GROUP=$(id -gn)"
WORKSPACE="-v ${WORKSPACE_PATH}:/workspace"
LAUNCH_CMD=""
Expand All @@ -94,7 +94,7 @@ set_variables() {
fi

MAP="-v ${MAP_PATH}:/${MAP_PATH}"
IMAGE="ghcr.io/autowarefoundation/autoware-openadk:runtime-$rosdistro-latest"
IMAGE="ghcr.io/autowarefoundation/autoware-openadk:latest-runtime"
WORKSPACE=""

# Echo
Expand All @@ -107,11 +107,11 @@ set_variables() {

# Set GPU flag based on option
set_gpu_flag() {
if [ "$option_no_nvidia" = "false" ]; then
IMAGE=${IMAGE}-cuda
GPU_FLAG="--gpus all"
else
if [ "$option_no_nvidia" = "true" ]; then
IMAGE=${IMAGE}-nocuda
GPU_FLAG=""
else
GPU_FLAG="--gpus all"
fi
}

Expand Down

0 comments on commit 1d3651f

Please sign in to comment.