Skip to content

Commit

Permalink
apply relevant review points
Browse files Browse the repository at this point in the history
  • Loading branch information
Benedikt Haas committed Jan 30, 2024
1 parent b0a10c5 commit 672395b
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 21 deletions.
16 changes: 16 additions & 0 deletions CARLOS_CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
## Latest : 1.0.0

## 1.0.0 - Initial Release

### Major changes

* Created GitHub workflow and Dockerfile to automatically build Docker images
* Update to Ubuntu 22.04 and Python 3.10 for prerequisites image
* Update to Ubuntu 22.04 and Python 3.10 for release image
* Created `vulkan-base` Dockerfile to replace discontinued `nvidia/vulkan` images used for the release image
* Added health check to release image

### Minor changes

* Added `ping.py` script to PythonAPI to enable health checks
* Fix [aria2](https://aria2.github.io/) related issue
14 changes: 0 additions & 14 deletions FEATURES.md

This file was deleted.

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@
</p>

> [!IMPORTANT]
> This repository is a minimal fork of the official [carla-simulator](https://github.com/carla-simulator/carla)! All modifications to the original repository are documented in [FEATURES.md](./FEATURES.md).
> This repository is a minimal fork of the official [carla-simulator](https://github.com/carla-simulator/carla)! All modifications to the original repository are documented in [CARLOS_CHANGELOG.md](./CARLOS_CHANGELOG.md).
> [!TIP]
> We recommend to use the *carla-simulator* as **simulation core** 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>
>
> Here, it constitutes the central element of a simulation and handles all graphical and dynamic calculations in the individual simulation time steps.
> [!NOTE]
> We set up a Continous Integration (CI) pipeline as [GitHub action](./github/workflows/docker.yml) to continously build Docker images for the `carla-simulator`, publicly available on [Docker Hub](https://hub.docker.com/r/rwthika/carla-simulator).
> We set up a Continous Integration (CI) pipeline as [GitHub workflow](./github/workflows/docker.yml) to continously build Docker images for the `carla-simulator`, publicly available on [Docker Hub](https://hub.docker.com/r/rwthika/carla-simulator).
---
---
Expand Down
10 changes: 6 additions & 4 deletions Util/BuildTools/Setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,12 @@ for PY_VERSION in ${PY_VERSION_LIST[@]} ; do
BOOST_PACKAGE_BASENAME=boost_${BOOST_VERSION//./_}

log "Retrieving boost."

# use boost backup instead of official release due to required verification
log "Using boost backup from aws carla-releases"
wget "https://carla-releases.s3.eu-west-3.amazonaws.com/Backup/${BOOST_PACKAGE_BASENAME}.tar.gz" || true
wget "https://boostorg.jfrog.io/artifactory/main/release/${BOOST_VERSION}/source/${BOOST_PACKAGE_BASENAME}.tar.gz" || true
# try to use the backup boost we have in Jenkins
if [[ ! -f "${BOOST_PACKAGE_BASENAME}.tar.gz" ]] ; then
log "Using boost backup"
wget "https://carla-releases.s3.eu-west-3.amazonaws.com/Backup/${BOOST_PACKAGE_BASENAME}.tar.gz" || true
fi

log "Extracting boost for Python ${PY_VERSION}."
tar -xzf ${BOOST_PACKAGE_BASENAME}.tar.gz
Expand Down
2 changes: 1 addition & 1 deletion Util/Docker/Release.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ RUN echo "export PYTHONPATH=\$PYTHONPATH:$CARLA_PYAPI_PATH/carla/dist/$(ls $CARL
USER carla
WORKDIR /home/carla

HEALTHCHECK --interval=5s --timeout=5s --start-period=10s --retries=3 \
HEALTHCHECK --interval=1s --timeout=5s --start-period=10s --retries=3 \
CMD python3 ./PythonAPI/util/ping.py

# you can also run CARLA in offscreen mode with -RenderOffScreen
Expand Down

0 comments on commit 672395b

Please sign in to comment.