apply relevant review points

CARLOS_CHANGELOG.md

@@ -0,0 +1,18 @@
+## Latest : 1.0.0
+
+## 1.0.0 - Initial Release
+
+- GitHub workflow to automatically build Docker images
+- update to CARLA 0.9.15
+- update to Ubuntu 22.04 and Python3.10 including corresponding pip versions
+
+### Major changes
+
+*   Created GitHub workflow to automatically build Docker images using [docker-ros](https://github.com/ika-rwth-aachen/docker-ros)
+*   Update to [CARLA 0.9.15](https://carla.org/2023/11/10/release-0.9.15/)
+*   Update to Ubuntu 22.04 and Python 3.10 including corresponding pip versions
+
+### Minor changes
+
+*   Small fixes related to version updates
+*   Move original Docker related content to `docker_original_folder/`

README.md

@@ -11,15 +11,15 @@
 </p>
 
 > [!IMPORTANT]
-> This repository is a minimal fork of the official [scenario_runner](https://github.com/carla-simulator/scenario_runner)! All modifications to the original repository are documented in [FEATURES.md](./FEATURES.md).
+> This repository is a minimal fork of the official [scenario_runner](https://github.com/carla-simulator/scenario_runner)! All initial and following modifications to the original repository are documented in [CARLOS_CHANGELOG.md](./CARLOS_CHANGELOG.md).
 
 > [!TIP]
 > We recommend to use the *carla-scenario-runner* as **control actor** in our open, modular and scalable simulation framework <a href="https://github.com/ika-rwth-aachen/carlos">**CARLOS**. <img src="https://img.shields.io/github/stars/ika-rwth-aachen/carlos?style=social"/></a> 
 >
 > The *carla-scenario-runner* is used to enable scenario-based testing and evaluation. It is a powerful engine that follows the OpenSCENARIO standard for scenario definitions.
 
 > [!NOTE]
-> We set up a Continous Integration (CI) pipeline as [GitHub action](./github/workflows/docker.yml) to continously build Docker images for the `carla-scenario-runner`, publicly available on [Docker Hub](https://hub.docker.com/r/rwthika/carla-scenario-runner).
+> We set up a Continous Integration (CI) pipeline as [GitHub workflow](./github/workflows/docker.yml) to continously build Docker images for the `carla-scenario-runner`, publicly available on [Docker Hub](https://hub.docker.com/r/rwthika/carla-scenario-runner).
 
 ---
 ---

docker/Dockerfile

@@ -2,7 +2,7 @@ ARG UBUNTU_VERSION="22.04"
 
 
 ############ dependencies ############
-FROM "ubuntu:${UBUNTU_VERSION}" as dependencies
+FROM "ubuntu:${UBUNTU_VERSION}"
 
 USER root
 SHELL ["/bin/bash", "-c"]
@@ -45,9 +45,6 @@ RUN echo "export PYTHONPATH=\$PYTHONPATH:$CARLA_API_PATH/carla/dist/$(ls $CARLA_
     echo "export CARLA_API_PATH=$CARLA_API_PATH" >> /setup_carla_env.sh; \
     echo "source /setup_carla_env.sh" >> ~/.bashrc
 
-############ final ############
-FROM dependencies as final
-
 # Needed for (pygame based) scripts that have a GUI
 ENV SDL_VIDEODRIVER=x11
 

srunner/scenariomanager/actorcontrols/carla_autopilot.py

@@ -18,7 +18,7 @@
 from srunner.scenariomanager.actorcontrols.basic_control import BasicControl
 
 
-class CarlaAutopilot(BasicControl):
+class CarlaAutoPilotControl(BasicControl):
 
     """
     Controller class for vehicles derived from BasicControl.
@@ -33,7 +33,7 @@ class CarlaAutopilot(BasicControl):
     """
 
     def __init__(self, actor, args=None):
-        super(CarlaAutopilot, self).__init__(actor)
+        super(CarlaAutoPilotControl, self).__init__(actor)
         self._actor.set_autopilot(enabled=True)
 
     def reset(self):