doc: documentation and shell changes (#2)

* Some documentation and shell changes * fix bug * doc: documentation and shell changes * remove unecessary changes
AutomotiveAIChallenge · Oct 20, 2023 · a21d724 · a21d724
1 parent ea02248
commit a21d724
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 14 deletions.
diff --git a/docker/aichallenge/build_autoware.sh b/docker/aichallenge/build_autoware.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 
-cd ../aichallenge_ws
+cd ./aichallenge_ws
 colcon build --symlink-install --cmake-args -DCMAKE_BUILD_TYPE=Release
 cd ..
diff --git a/docker/aichallenge/run_autoware.sh b/docker/aichallenge/run_autoware.sh
@@ -2,6 +2,6 @@
 
 sudo ip link set multicast on lo
 
-source ../aichallenge_ws/install/setup.bash
+source ./aichallenge_ws/install/setup.bash
 rm -f result.json
 ros2 launch aichallenge_launch aichallenge.launch.xml
diff --git a/docker/evaluation/Dockerfile b/docker/evaluation/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/automotiveaichallenge/aichallenge2023-racing/autoware-universe-cuda:v1
+FROM ghcr.io/automotiveaichallenge/aichallenge2023-racing/autoware-universe-no-cuda:latest
 
 # Advance Preparation (Create working files and download various files from Github)
 RUN rm -rf /autoware/install/tier4_*_launch

diff --git a/docker/train/Dockerfile b/docker/train/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/automotiveaichallenge/aichallenge2023-racing/autoware-universe-cuda:v1
+FROM ghcr.io/automotiveaichallenge/aichallenge2023-racing/autoware-universe-no-cuda:latest
 
 RUN rm -rf /autoware/install/tier4_*_launch
 

diff --git a/documentation/docfx_project/local/index.md b/documentation/docfx_project/local/index.md
@@ -29,14 +29,14 @@
 1. Docker Image Build
 ```
 #aichallenge2023-racingディレクトリで
-cd docker
+cd docker/train
 bash build_docker.sh
 ```
 
 2. Docker Container Run
 ```
 #aichallenge2023-racingディレクトリで
-cd docker
+cd docker/train
 bash run_container.sh
 ```
 

diff --git a/documentation/docfx_project/setup/index.md b/documentation/docfx_project/setup/index.md
@@ -88,7 +88,7 @@
 * Dockerイメージの準備・起動 〜 Autowareの準備
    1. Dockerイメージを入手
     ```
-   docker pull ghcr.io/automotiveaichallenge/aichallenge2023-racing/autoware-universe-cuda:v1
+   docker pull ghcr.io/automotiveaichallenge/aichallenge2023-racing/autoware-universe-no-cuda:latest
     ```
     ※上記の方法では長時間かかってしまう方・タイムアウトしてしまう方↓  
 　[こちら](https://drive.google.com/file/d/1mOEpiN36UPe70NqiibloDcd_ewgMr_5P/view?usp=sharing)に、イメージをtarにまとめたものを置きましたので、下記コマンドよりご利用ください
@@ -102,7 +102,7 @@
     ```
     3. 大会用dockerイメージのビルド
     ```
-    cd ./aichallenge2023-racing/docker
+    cd ./aichallenge2023-racing/docker/train
     bash build_docker.sh
     ```
     4. 大会用dockerコンテナの起動
@@ -120,7 +120,7 @@ DockerコンテナからAWSIMを起動したい場合は、Dockerイメージの
    ```
    確認ができたら以下のコマンドでrockerを起動してください。
    ```
-    cd ./aichallenge2023-racing/docker
+    cd ./aichallenge2023-racing/docker/train
     bash run_container.sh
    ```
    新たに開いたterminalで`docker container ls` で以下のようにdocker が存在していることを確認してください。

diff --git a/documentation/docfx_project_en/local/index.md b/documentation/docfx_project_en/local/index.md
@@ -39,14 +39,14 @@
 1. Docker Image Build
 ```
 #In the aichallenge2023-racing directory
-cd docker
+cd docker/train
 bash build_docker.sh
 ```
 
 2. Docker Container Run
 ```
 #In the aichallenge2023-racing directory
-cd docker
+cd docker/train
 bash run_container.sh
 ```
 

diff --git a/documentation/docfx_project_en/setup/index.md b/documentation/docfx_project_en/setup/index.md
@@ -87,7 +87,7 @@ Please install the following.
 * Prepare and launch Docker image - Prepare Autoware
    1. get a Docker image
     ```
-   docker pull ghcr.io/automotiveaichallenge/aichallenge2023-racing/autoware-universe-cuda:v1
+   docker pull ghcr.io/automotiveaichallenge/aichallenge2023-racing/autoware-universe-no-cuda:latest
     ```
     If the above method takes a long time or times out, you can use the following method.  
 　We have placed a tarball of the image at [here](https://drive.google.com/file/d/1mOEpiN36UPe70NqiibloDcd_ewgMr_5P/view?usp=sharing). Please use the following command
@@ -101,7 +101,7 @@ Please install the following.
     ```
     3. build docker image for competition
     ```
-    cd ./aichallenge2023-racing/docker
+    cd ./aichallenge2023-racing/docker/train
     bash build_docker.sh
     ```
     4. start rocker
@@ -120,7 +120,7 @@ If you want to start AWSIM from a Docker container, please follow the steps belo
    ```
    Once confirmed, launch rocker with the following command.
    ```
-    cd ./aichallenge2023-racing/docker
+    cd ./aichallenge2023-racing/docker/train
     bash run_container.sh
    ```
    Open a new terminal and confirm the existence of the docker container by using the `docker container ls` command. below is an example.