Skip to content

Commit ea854b6

Browse files
(feat) completed and tested development container
1 parent bd3da41 commit ea854b6

File tree

3 files changed

+15
-4
lines changed

3 files changed

+15
-4
lines changed

.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,9 @@ jats
3232
paper
3333
logs
3434
typings
35+
cawsr_workspace
36+
tools
37+
scenarios
38+
algorithms
39+
configs
40+
results

dev/Dockerfile

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,10 @@ RUN apt-get update -y && \
4747

4848
# install pip packages and setup docker entrypoint
4949
RUN python3 -m pip install -r requirements.txt && \
50-
mv docker/PythonAPI.tar ./ && \
51-
tar -xvf PythonAPI.tar && \
52-
rm -rf PythonAPI.tar && \
50+
mkdir -p /carla_api && \
51+
mv /autoware_scenario_runner/docker/PythonAPI.tar /carla_api/ && \
52+
tar -xvf /carla_api/PythonAPI.tar -C /carla_api && \
53+
rm -rf /carla_api/PythonAPI.tar && \
5354
cd /container_tools && \
5455
chmod +x /container_tools/entrypoint.sh && \
5556
mkdir logs
@@ -62,11 +63,13 @@ RUN mkdir /cyclonedds && \
6263
echo "export RMW_IMPLEMENTATION=rmw_cyclonedds_cpp" >> /home/carla/.bashrc && \
6364
echo "alias rossrc='source ${AUTOWARE_MSG_PKG} && source ${ROS_PKG} && echo Sourced'" >> /home/carla/.bashrc
6465

65-
ENV CARLA_API_ROOT="/autoware_scenario_runner/PythonAPI"
66+
ENV CARLA_API_ROOT="/carla_api/PythonAPI"
6667
ENV PYTHONPATH="${PYTHONPATH}:${CARLA_API_ROOT}/carla/agents:${CARLA_API_ROOT}/carla"
6768

6869
# Give carla user ownership of necessary directories
6970
RUN chown -R carla:carla /autoware_scenario_runner && \
71+
chown -R carla:carla /carla_api && \
72+
chown -R carla:carla /container_tools && \
7073
chown -R carla:carla /ros_workspace && \
7174
chown -R carla:carla /cyclonedds && \
7275
usermod -aG docker carla

dev/pull_workspace.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@
22

33
cd ..
44
git clone https://github.com/Intelligent-Testing-Lab/cawsr_workspace.git
5+
6+
find . -maxdepth 1 ! -name ".git" ! -name ".gitignore" ! -name "requirements.txt" ! -name "README.md" ! -name "docker-compose.yml" -exec mv {} /path/to/destination/ \;

0 commit comments

Comments
 (0)